From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 23 Mar 2013 13:01:03 +0000 (+0000)
Subject: Allow rm to act on multiple paths (issue #50)
X-Git-Tag: 0.1~664
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=538d6d45fccb73d1f3342471c1928f612d718a8a;p=fdroidserver.git

Allow rm to act on multiple paths (issue #50)
---

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 2be5524d..65c83902 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -704,6 +704,8 @@ the root of the directory structure checked out from the source
 respository - not necessarily the directory that contains
 AndroidManifest.xml.
 
+Multiple files can be specified by separating they with ';'.
+
 @item antcommand=xxx
 Specify an alternate ant command (target) instead of the default
 'release'.
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f7344c87..4b2ec5a9 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1753,9 +1753,10 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
 
     # Delete unwanted file...
     if 'rm' in build:
-        dest = os.path.join(build_dir, build['rm'])
-        if os.path.exists(dest):
-            os.remove(dest)
+        for part in build['rm'].split(';'):
+            dest = os.path.join(build_dir, part)
+            if os.path.exists(dest):
+                os.remove(dest)
 
     # Fix apostrophes translation files if necessary...
     if build.get('fixapos', 'no') == 'yes':