mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow for leading and trailing whitespaces in ';'-separated lists (e.g. update= abc ; def ; ...)

Browse source
This commit is contained in:
Daniel Martí 2013-09-11 13:45:02 +02:00
parent fba8fb839c
commit 9257690f95
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/build.py
View file

@ -240,6 +240,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
if 'extlibs' in thisbuild:
ftp.chdir('/home/vagrant/build/extlib')
for lib in thisbuild['extlibs'].split(';'):
lib = lib.strip()
lp = lib.split('/')
for d in lp[:-1]:
if d not in ftp.listdir():
@ -252,6 +253,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
srclibpaths = []
if 'srclibs' in thisbuild:
for lib in thisbuild['srclibs'].split(';'):
lib = lib.strip()
name, _ = lib.split('@')
if options.verbose:
print "Processing srclib '" + name + "'"
@ -399,7 +401,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if jni_components == 'yes':
jni_components = ['']
else:
jni_components = jni_components.split(';')
jni_components = [c.strip() for c in jni_components.split(';')]
ndkbuild = os.path.join(ndk_path, "ndk-build")
for d in jni_components:
if options.verbose: