From 8c8a20bcb1ed9745cca90deef860c532e500a1ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 3 Aug 2013 18:37:29 +0200 Subject: [PATCH] Merge master into gradle --- fdroidserver/checkupdates.py | 5 ++++- fdroidserver/common.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 2bf68539..20f51b80 100644 --- 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 8baa502f..30162da3 100644 --- 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') -- 2.30.2