From: Daniel Martí Date: Mon, 28 Oct 2013 23:35:14 +0000 (+0100) Subject: Don't try to find output if we're doing an --install X-Git-Tag: 0.1~283 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4fb857bbb06e4d2dceef5888d2fe68251812ba82;p=fdroidserver.git Don't try to find output if we're doing an --install --- diff --git a/fdroidserver/build.py b/fdroidserver/build.py index e272815c..66eea558 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -544,6 +544,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout, p.stderr) print "Successfully built version " + thisbuild['version'] + ' of ' + app['id'] + if install: + return + # Find the apk name in the output... if 'bindir' in thisbuild: bindir = os.path.join(build_dir, thisbuild['bindir']) @@ -585,7 +588,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d src = os.path.join(bindir, src) # Make sure it's not debuggable... - if not install and common.isApkDebuggable(src): + if common.isApkDebuggable(src): raise BuildException("APK is debuggable") # By way of a sanity check, make sure the version and version