kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

Some more symlink-related improvements

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-11-24 10:29:28 +00:00
parent 4ee57f2d8b
commit da0af33bf4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdroidserver/common.py
View File

@ -905,13 +905,21 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
for part in build['rm'].split(';'): for part in build['rm'].split(';'):
dest = os.path.join(build_dir, part.strip()) dest = os.path.join(build_dir, part.strip())
rdest = os.path.abspath(dest) rdest = os.path.abspath(dest)
if options.verbose:
print "Removing {0}".format(rdest)
if not rdest.startswith(os.path.abspath(build_dir)): if not rdest.startswith(os.path.abspath(build_dir)):
raise BuildException("rm for {1} is outside build root {0}".format( raise BuildException("rm for {1} is outside build root {0}".format(
os.path.abspath(build_dir),os.path.abspath(dest))) os.path.abspath(build_dir),os.path.abspath(dest)))
if rdest == os.path.abspath(build_dir): if rdest == os.path.abspath(build_dir):
raise BuildException("rm removes whole build directory") raise BuildException("rm removes whole build directory")
if os.path.exists(rdest): if os.path.lexists(rdest):
subprocess.call('rm -rf ' + rdest, shell=True) if os.path.islink(rdest):
subprocess.call('unlink ' + rdest, shell=True)
else:
subprocess.call('rm -rf ' + rdest, shell=True)
else:
if options.verbose:
print "...but it didn't exist"
# Fix apostrophes translation files if necessary... # Fix apostrophes translation files if necessary...
if build['fixapos']: if build['fixapos']: