From e676e34c1262554e5b72cfcc3245d57ddab82282 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 15 Jul 2013 14:14:06 +0100 Subject: [PATCH] The novcheck option should not bypass package id checking --- fdroidserver/build.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index f3c039aa..413b68f8 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -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 -- 2.30.2