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

Regression - we won't do subvercodes

Browse Source
This commit is contained in:
Daniel Martí 2013-10-25 10:37:53 +02:00
parent 3e8db35101
commit 0ba888850a
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/common.py
View File

@ -465,19 +465,9 @@ def parse_metadata(metafile, **kw):
thisbuild = {} thisbuild = {}
thisbuild['origlines'] = lines thisbuild['origlines'] = lines
thisbuild['version'] = parts[0] thisbuild['version'] = parts[0]
ver = parts[1].split('-')
if len(ver) == 1:
thisbuild['vercode'] = parts[1] thisbuild['vercode'] = parts[1]
thisbuild['subvercode'] = None
elif len(ver) == 2:
thisbuild['vercode'] = ver[0]
thisbuild['subvercode'] = ver[1]
else:
raise MetaDataException("Invalid version code for build in " + metafile.name)
try: try:
testvercode = int(thisbuild['vercode']) testvercode = int(thisbuild['vercode'])
if thisbuild['subvercode'] is not None:
testsubvercode = int(thisbuild['subvercode'])
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]
@ -635,9 +625,7 @@ def parse_metadata(metafile, **kw):
return thisinfo return thisinfo
def getvercode(build): def getvercode(build):
if build['subvercode'] is None: return "%s" % (build['vercode'])
return build['vercode']
return "%s-%s" % (build['vercode'], build['subvercode'])
def getapkname(app, build): def getapkname(app, build):
return "%s_%s.apk" % (app['id'], getvercode(build)) return "%s_%s.apk" % (app['id'], getvercode(build))

1
fdroidserver/import.py
View File

@ -264,7 +264,6 @@ def main():
build = {} build = {}
build['version'] = version build['version'] = version
build['vercode'] = vercode build['vercode'] = vercode
build['subvercode'] = None
build['commit'] = '?' build['commit'] = '?'
if options.subdir: if options.subdir:
build['subdir'] = options.subdir build['subdir'] = options.subdir