chiark / gitweb /
Keep version names even if found separate from the code
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 16 Jun 2014 10:30:33 +0000 (12:30 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 16 Jun 2014 10:30:33 +0000 (12:30 +0200)
fdroidserver/common.py

index fc31a8bd76869a801bcbb8230d7bcb43e3863ee6..303b3b6b18e01ecb61a7bab9a3c63708b1ed6b93 100644 (file)
@@ -858,12 +858,12 @@ def parse_androidmanifests(paths, ignoreversions=None):
     max_version = None
     max_vercode = None
     max_package = None
+    version = None
+    vercode = None
 
     for path in paths:
 
         gradle = has_extension(path, 'gradle')
-        version = None
-        vercode = None
         # Remember package name, may be defined separately from version+vercode
         package = max_package
 
@@ -903,7 +903,7 @@ def parse_androidmanifests(paths, ignoreversions=None):
                 max_version = "Ignore"
 
     if max_version is None:
-        max_version = "Unknown"
+        max_version = version if version else "Unknown"
 
     return (max_version, max_vercode, max_package)