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

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 2be5524dc3b59b925698003258afdce23e265796..65c8390256290398e5f71cda8a02466d754c001f 100644 (file)
--- 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 f7344c87b50429dc43b57ad1a57d0b76765918e4..4b2ec5a986fd00ee339f9fd290015707e1e6b212 100644 (file)
--- 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':