From 1198c0299c323ded3a1681f193e4e22b6ea00dbb Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sun, 24 Nov 2013 09:39:12 +0000 Subject: [PATCH] Remove signing keys later in build Specifically, after rm, otherwise it can attempt to modify files (or symlinks!) that are going to be removed. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index c7f3052a..f2489c65 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -821,8 +821,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= raise BuildException("Failed to update project at %s" % d, p.stdout, p.stderr) - remove_signing_keys(build_dir) - # Update the local.properties file... localprops = [ os.path.join(build_dir, 'local.properties') ] if 'subdir' in build: @@ -965,6 +963,8 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= f.writelines(outlines) f.close() + remove_signing_keys(build_dir) + # Add required external libraries... if 'extlibs' in build: print "Collecting prebuilt libraries..."