From 4193caa0d4f36e851f5e9b47a30e5737a56c46d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 16 Sep 2013 12:53:27 +0200 Subject: [PATCH] Remove all bin dirs on update= dirs, be more verbose --- fdroidserver/common.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 8679c0b5..98f837cd 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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