mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 15:13:27 +02:00
Regression - we won't do subvercodes
This commit is contained in:
parent
3e8db35101
commit
0ba888850a
@ -465,19 +465,9 @@ def parse_metadata(metafile, **kw):
|
||||
thisbuild = {}
|
||||
thisbuild['origlines'] = lines
|
||||
thisbuild['version'] = parts[0]
|
||||
ver = parts[1].split('-')
|
||||
if len(ver) == 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)
|
||||
thisbuild['vercode'] = parts[1]
|
||||
try:
|
||||
testvercode = int(thisbuild['vercode'])
|
||||
if thisbuild['subvercode'] is not None:
|
||||
testsubvercode = int(thisbuild['subvercode'])
|
||||
except:
|
||||
raise MetaDataException("Invalid version code for build in " + metafile.name)
|
||||
thisbuild['commit'] = parts[2]
|
||||
@ -635,9 +625,7 @@ def parse_metadata(metafile, **kw):
|
||||
return thisinfo
|
||||
|
||||
def getvercode(build):
|
||||
if build['subvercode'] is None:
|
||||
return build['vercode']
|
||||
return "%s-%s" % (build['vercode'], build['subvercode'])
|
||||
return "%s" % (build['vercode'])
|
||||
|
||||
def getapkname(app, build):
|
||||
return "%s_%s.apk" % (app['id'], getvercode(build))
|
||||
|
@ -264,7 +264,6 @@ def main():
|
||||
build = {}
|
||||
build['version'] = version
|
||||
build['vercode'] = vercode
|
||||
build['subvercode'] = None
|
||||
build['commit'] = '?'
|
||||
if options.subdir:
|
||||
build['subdir'] = options.subdir
|
||||
|
Loading…
Reference in New Issue
Block a user