From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 13 Aug 2013 12:51:40 +0000 (+0200)
Subject: Small fixes to checkupdates
X-Git-Tag: 0.1~457^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cf47e151f7bb6b91ceb1536343d6bf07be55d136;p=fdroidserver.git

Small fixes to checkupdates
---

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 93998666..ee80bca6 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -139,6 +139,8 @@ def check_repomanifest(app, sdk_path, branch=None):
         elif vcs.repotype() == 'bzr':
             vcs.gotorevision(None)
 
+        flavour = None
+
         if len(app['builds']) > 0:
             if 'subdir' in app['builds'][-1]:
                 build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
@@ -150,7 +152,7 @@ def check_repomanifest(app, sdk_path, branch=None):
 
         paths = common.manifest_paths(build_dir, flavour)
 
-        version, vercode, package = common.parse_androidmanifest(paths)
+        version, vercode, package = common.parse_androidmanifests(paths)
         if not package:
             return (None, "Couldn't find package ID")
         if package != app['id']:
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ac1218b5..528a9dbf 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -930,7 +930,7 @@ def parse_androidmanifests(paths):
 
     for path in paths:
 
-        gradle = path.endswith("build.gradle")
+        gradle = path.endswith("gradle")
         version = None
         vercode = None
         package = None