kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Revert "fix vercodes."

Browse Source 
This (partially) reverts commit 05735e9fca.
This commit is contained in:
Daniel Martí 2013-05-20 15:48:55 +02:00
parent bdf24d1891
commit 6808d5d5ed
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdroidserver/common.py
View File

@ -416,7 +416,7 @@ def parse_metadata(metafile, **kw):
thisbuild['version'] = parts[0] thisbuild['version'] = parts[0]
thisbuild['vercode'] = parts[1] thisbuild['vercode'] = parts[1]
try: try:
thisbuild['vercode'] = int(thisbuild['vercode']) testvercode = int(thisbuild['vercode'])
except: except:
raise MetaDataException("Invalid version code for build in " + metafile.name) raise MetaDataException("Invalid version code for build in " + metafile.name)
thisbuild['commit'] = parts[2] thisbuild['commit'] = parts[2]
@ -617,7 +617,7 @@ def write_metadata(dest, app):
# Keeping the original formatting if we loaded it from a file... # Keeping the original formatting if we loaded it from a file...
mf.write('\\\n'.join(build['origlines']) + '\n') mf.write('\\\n'.join(build['origlines']) + '\n')
else: else:
mf.write(build['version'] + ',' + str(build['vercode']) + ',' + mf.write(build['version'] + ',' + build['vercode'] + ',' +
build['commit']) build['commit'])
for key,value in build.iteritems(): for key,value in build.iteritems():
if key not in ['version', 'vercode', 'commit']: if key not in ['version', 'vercode', 'commit']:
@ -861,7 +861,7 @@ def parse_androidmanifest(app_dir):
if not vercode: if not vercode:
matches = vcsearch(line) matches = vcsearch(line)
if matches: if matches:
vercode = int(matches.group(1)) vercode = matches.group(1)
if version: if version:
return (version, vercode, package) return (version, vercode, package)
for xmlfile in glob.glob(app_dir + '/res/values/strings*transl*.xml'): for xmlfile in glob.glob(app_dir + '/res/values/strings*transl*.xml'):
@ -1116,7 +1116,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
if 'forcevercode' in build: if 'forcevercode' in build:
if subprocess.call(['sed','-r','-i', if subprocess.call(['sed','-r','-i',
's/android:versionCode="[^"]+"/android:versionCode="' + str(build['vercode']) + '"/g', 's/android:versionCode="[^"]+"/android:versionCode="' + build['vercode'] + '"/g',
'AndroidManifest.xml'], cwd=root_dir) !=0: 'AndroidManifest.xml'], cwd=root_dir) !=0:
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")

3
fdroidserver/update.py
View File

@ -86,7 +86,8 @@ def update_wiki(apps, apks, verbose=False):
if thisbuild['vercode'] == app['Current Version Code']: if thisbuild['vercode'] == app['Current Version Code']:
cantupdate = True cantupdate = True
apklist.append({ apklist.append({
'versioncode': thisbuild['vercode'], #TODO: Nasty: vercode is a string in the build, and an int elsewhere
'versioncode': int(thisbuild['vercode']),
'version': thisbuild['version'], 'version': thisbuild['version'],
'buildproblem': thisbuild['commit'][1:] 'buildproblem': thisbuild['commit'][1:]
}) })