From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 15 Feb 2014 09:56:35 +0000 (+0100)
Subject: buildjni is a list field too, some server fixes
X-Git-Tag: 0.2~279
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=67acf4c3fca75e16f8ae9daadcde184029dfa9d4;p=fdroidserver.git

buildjni is a list field too, some server fixes
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index dd669712..76c3a752 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -266,7 +266,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         # Copy any extlibs that are required...
         if 'extlibs' in thisbuild:
             ftp.chdir('/home/vagrant/build/extlib')
-            for lib in thisbuild['extlibs'].split(';'):
+            for lib in thisbuild['extlibs']:
                 lib = lib.strip()
                 libsrc = os.path.join('build/extlib', lib)
                 if not os.path.exists(libsrc):
@@ -282,7 +282,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         # Copy any srclibs that are required...
         srclibpaths = []
         if 'srclibs' in thisbuild:
-            for lib in thisbuild['srclibs'].split(';'):
+            for lib in thisbuild['srclibs']:
                 srclibpaths.append(common.getsrclib(lib, 'build/srclib', srclibpaths,
                     basepath=True, prepare=False))
 
@@ -459,10 +459,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     if thisbuild.get('buildjni') not in (None, 'no'):
         logging.info("Building native libraries...")
         jni_components = thisbuild.get('buildjni')
-        if jni_components == 'yes':
+        if jni_components == ['yes']:
             jni_components = ['']
-        else:
-            jni_components = [c.strip() for c in jni_components.split(';')]
         ndkbuild = os.path.join(config['ndk_path'], "ndk-build")
         for d in jni_components:
             logging.info("Building native code in '%s'" % d)
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 857622e0..7a81fd0c 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -451,7 +451,8 @@ def metafieldtype(name):
     return 'string'
 
 def flagtype(name):
-    if name in ['extlibs', 'srclibs', 'patch', 'rm', 'scanignore', 'scandelete']:
+    if name in ['extlibs', 'srclibs', 'patch', 'rm', 'buildjni',
+            'scanignore', 'scandelete']:
         return 'list'
     if name in ['init', 'prebuild', 'build']:
         return 'script'