1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00

Remove signing keys later in build

Specifically, after rm, otherwise it can attempt to modify files (or
symlinks!) that are going to be removed.
This commit is contained in:
Ciaran Gultnieks 2013-11-24 09:39:12 +00:00
parent 0231409224
commit 1198c0299c

View File

@ -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..."