mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
The novcheck option should not bypass package id checking
This commit is contained in:
parent
73ef03b7d4
commit
e676e34c12
@ -475,27 +475,27 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
||||
'dump', 'badging', src],
|
||||
stdout=subprocess.PIPE)
|
||||
output = p.communicate()[0]
|
||||
|
||||
vercode = None
|
||||
version = None
|
||||
foundid = None
|
||||
for line in output.splitlines():
|
||||
if line.startswith("package:"):
|
||||
pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
|
||||
foundid = re.match(pat, line).group(1)
|
||||
pat = re.compile(".*versionCode='([0-9]*)'.*")
|
||||
vercode = re.match(pat, line).group(1)
|
||||
pat = re.compile(".*versionName='([^']*)'.*")
|
||||
version = re.match(pat, line).group(1)
|
||||
if thisbuild.get('novcheck', 'no') == "yes":
|
||||
vercode = thisbuild['vercode']
|
||||
version = thisbuild['version']
|
||||
else:
|
||||
vercode = None
|
||||
version = None
|
||||
foundid = None
|
||||
for line in output.splitlines():
|
||||
if line.startswith("package:"):
|
||||
pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
|
||||
foundid = re.match(pat, line).group(1)
|
||||
pat = re.compile(".*versionCode='([0-9]*)'.*")
|
||||
vercode = re.match(pat, line).group(1)
|
||||
pat = re.compile(".*versionName='([^']*)'.*")
|
||||
version = re.match(pat, line).group(1)
|
||||
if not version or not vercode:
|
||||
raise BuildException("Could not find version information in build in output")
|
||||
if not foundid:
|
||||
raise BuildException("Could not find package ID in output")
|
||||
if foundid != app['id']:
|
||||
raise BuildException("Wrong package ID - build " + foundid + " but expected " + app['id'])
|
||||
if not version or not vercode:
|
||||
raise BuildException("Could not find version information in build in output")
|
||||
if not foundid:
|
||||
raise BuildException("Could not find package ID in output")
|
||||
if foundid != app['id']:
|
||||
raise BuildException("Wrong package ID - build " + foundid + " but expected " + app['id'])
|
||||
|
||||
# Some apps (e.g. Timeriffic) have had the bonkers idea of
|
||||
# including the entire changelog in the version number. Remove
|
||||
|
Loading…
Reference in New Issue
Block a user