From 03deda914f03ac4467e241cf0b3f745db7d043a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 8 Sep 2015 13:12:28 -0700 Subject: [PATCH] checkupdates improvements for gradle projects * Let the package name override the one found in AndroidManifest.xml * Support the newer applicationId --- fdroidserver/common.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b6137520..795de66d 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -991,7 +991,7 @@ def parse_androidmanifests(paths, ignoreversions=None): vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search - psearch_g = re.compile(r'.*packageName *=* *["\']([^"]+)["\'].*').search + psearch_g = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search ignoresearch = re.compile(ignoreversions).search if ignoreversions else None @@ -1008,15 +1008,16 @@ def parse_androidmanifests(paths, ignoreversions=None): gradle = has_extension(path, 'gradle') version = None vercode = None - # Remember package name, may be defined separately from version+vercode - package = max_package + package = None if gradle: for line in file(path): + # Grab first occurence of each to avoid running into + # alternative flavours and builds. if not package: matches = psearch_g(line) if matches: - package = matches.group(1) + package = matches.group(2) if not version: matches = vnsearch_g(line) if matches: @@ -1038,6 +1039,10 @@ def parse_androidmanifests(paths, ignoreversions=None): if string_is_integer(a): vercode = a + # Remember package name, may be defined separately from version+vercode + if package is None: + package = max_package + logging.debug("..got package={0}, version={1}, vercode={2}" .format(package, version, vercode))