mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-03-23 13:01:03 +00:00
parent 81d20c7637
commit 538d6d45fc
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/fdroid.texi
View file

@ -704,6 +704,8 @@ the root of the directory structure checked out from the source
respository - not necessarily the directory that contains respository - not necessarily the directory that contains
AndroidManifest.xml. AndroidManifest.xml.
Multiple files can be specified by separating they with ';'.
@item antcommand=xxx @item antcommand=xxx
Specify an alternate ant command (target) instead of the default Specify an alternate ant command (target) instead of the default
'release'. 'release'.

7
fdroidserver/common.py
View file

@ -1753,9 +1753,10 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
# Delete unwanted file... # Delete unwanted file...
if 'rm' in build: if 'rm' in build:
dest = os.path.join(build_dir, build['rm']) for part in build['rm'].split(';'):
if os.path.exists(dest): dest = os.path.join(build_dir, part)
os.remove(dest) if os.path.exists(dest):
os.remove(dest)
# Fix apostrophes translation files if necessary... # Fix apostrophes translation files if necessary...
if build.get('fixapos', 'no') == 'yes': if build.get('fixapos', 'no') == 'yes':