From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 20 Jun 2014 09:10:52 +0000 (+0200)
Subject: Revert "Keep version names even if found separate from the code"
X-Git-Tag: 0.2~19
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5500787935d4f69674661b2861f9049d9e0537c2;p=fdroidserver.git

Revert "Keep version names even if found separate from the code"

This reverts commit 75381ef14718f3821acefaa64a4f7d5243ba15df.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8c7c0286..edd1a6a2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -861,12 +861,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
 
@@ -906,7 +906,7 @@ def parse_androidmanifests(paths, ignoreversions=None):
                 max_version = "Ignore"
 
     if max_version is None:
-        max_version = version if version else "Unknown"
+        max_version = "Unknown"
 
     return (max_version, max_vercode, max_package)