mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove signing keys later in build

Browse source 
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
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
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, raise BuildException("Failed to update project at %s" % d,
p.stdout, p.stderr) p.stdout, p.stderr)
remove_signing_keys(build_dir)
# Update the local.properties file... # Update the local.properties file...
localprops = [ os.path.join(build_dir, 'local.properties') ] localprops = [ os.path.join(build_dir, 'local.properties') ]
if 'subdir' in build: 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.writelines(outlines)
f.close() f.close()
remove_signing_keys(build_dir)
# Add required external libraries... # Add required external libraries...
if 'extlibs' in build: if 'extlibs' in build:
print "Collecting prebuilt libraries..." print "Collecting prebuilt libraries..."