From 1fcb56b946e912af1329aac046b00f6364791fd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 13 Aug 2013 15:25:47 +0200 Subject: [PATCH] Use last found package name if none found --- fdroidserver/common.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 528a9dbf..6664ce69 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -933,7 +933,8 @@ def parse_androidmanifests(paths): gradle = path.endswith("gradle") version = None vercode = None - package = None + # Remember package name, may be defined separately from version+vercode + package = max_package for line in file(path): if not package: @@ -958,6 +959,10 @@ def parse_androidmanifests(paths): if matches: vercode = matches.group(1) + # Better some package name than nothing + if max_package is None: + max_package = package + if max_vercode is None or (vercode is not None and vercode > max_vercode): max_version = version max_vercode = vercode -- 2.30.2