From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 21 Aug 2013 14:20:27 +0000 (+0200)
Subject: Remove bin/ and gen/ in update= dirs too!
X-Git-Tag: 0.1~439
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f6554d846c52052d3f5a37d1f3f9122a5bb64b0f;p=fdroidserver.git

Remove bin/ and gen/ in update= dirs too!
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7ec432b4..2802afaa 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1199,6 +1199,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
                 os.remove(buildxml)
         for d in update_dirs:
             cwd = os.path.join(root_dir, d)
+            # Remove gen and bin dirs in libraries
+            # rid of them...
+            for baddir in ['gen', 'bin']:
+                badpath = os.path.join(cwd, baddir)
+                if os.path.exists(badpath):
+                    shutil.rmtree(badpath)
             if verbose:
                 print "Update of '%s': exec '%s' in '%s'"%\
                     (d," ".join(parms),cwd)