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

Remove all bin dirs on update= dirs, be more verbose

Browse Source
This commit is contained in:
Daniel Martí 2013-09-16 12:53:27 +02:00
parent c4237fe732
commit 4193caa0d4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/common.py
View File

@ -1211,9 +1211,10 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
cwd = os.path.join(root_dir, d) cwd = os.path.join(root_dir, d)
# Remove gen and bin dirs in libraries # Remove gen and bin dirs in libraries
# rid of them... # rid of them...
for baddir in ['gen', 'bin']: for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']:
badpath = os.path.join(cwd, baddir) badpath = os.path.join(cwd, baddir)
if os.path.exists(badpath): if os.path.exists(badpath):
print "Removing %s in update dir %s" % (badpath, d)
shutil.rmtree(badpath) shutil.rmtree(badpath)
if verbose: if verbose:
print "Update of '%s': exec '%s' in '%s'"%\ print "Update of '%s': exec '%s' in '%s'"%\
@ -1354,6 +1355,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']: for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']:
badpath = os.path.join(root_dir, baddir) badpath = os.path.join(root_dir, baddir)
if os.path.exists(badpath): if os.path.exists(badpath):
print "Removing %s" % badpath
shutil.rmtree(badpath) shutil.rmtree(badpath)
# Apply patches if any # Apply patches if any