mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-04 14:30:11 +01:00
Remove all bin dirs on update= dirs, be more verbose
This commit is contained in:
parent
c4237fe732
commit
4193caa0d4
@ -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)
|
||||
# Remove gen and bin dirs in libraries
|
||||
# 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)
|
||||
if os.path.exists(badpath):
|
||||
print "Removing %s in update dir %s" % (badpath, d)
|
||||
shutil.rmtree(badpath)
|
||||
if verbose:
|
||||
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']:
|
||||
badpath = os.path.join(root_dir, baddir)
|
||||
if os.path.exists(badpath):
|
||||
print "Removing %s" % badpath
|
||||
shutil.rmtree(badpath)
|
||||
|
||||
# Apply patches if any
|
||||
|
Loading…
Reference in New Issue
Block a user