Merge master into gradle

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 2bf685395c0f941047710666d5ab30f09b255f6d..20f51b80150bae57ea4b2f3ee180498cc39aab38 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -71,8 +71,11 @@ def check_tags(app, sdk_path):
             vcs.gotorevision(tag)
 
             # Only process tags where the manifest exists...
-            if os.path.exists(common.manifest_path(build_dir)):
+            path = common.manifest_path(build_dir)
+            print "Trying manifest at %s" % path
+            if os.path.exists(path):
                 version, vercode, package = common.parse_androidmanifest(build_dir)
+                print "Manifest exists. Found version %s" % version
                 if package and package == app['id'] and version and vercode:
                     if int(vercode) > int(hcode):
                         hcode = str(int(vercode))

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8baa502f3847d2005bfc884f568e6bdb1bf736a6..30162da37ab5f83e2c762852c7bcef53898ca693 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1070,6 +1070,7 @@ def getsrclib(spec, srclib_dir, sdk_path, ndk_path="", mvn3="", basepath=False,
                         + name, out, err)
         
         if srclib["Update Project"] == "Yes":
+            print "Updating srclib %s at path %s" % (name, libdir)
             if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
                 'update', 'project', '-p', libdir]) != 0:
                     raise BuildException( 'Error updating ' + name + ' project')