Fix a buildjni regression

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 7ed210dc8925a68979dea2f6fd8ecb197db59f0a..5f60e0f1d42e71b0f8c2df952cb45729fe6e52a5 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -457,7 +457,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
                     (app['id'], thisbuild['version']), p.stdout)
 
     # Build native stuff if required...
-    if thisbuild.get('buildjni') not in (None, 'no'):
+    if thisbuild.get('buildjni') not in (None, ['no']):
         logging.info("Building native libraries...")
         jni_components = thisbuild.get('buildjni')
         if jni_components == ['yes']:

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 6d0e8ef3f8a1a0113e5f47007421e5ee6c8ebba3..afc403f53ba28ead4493fa8481f0997f3ffad7bc 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -286,7 +286,7 @@ def main():
     if options.subdir:
         build['subdir'] = options.subdir
     if os.path.exists(os.path.join(root_dir, 'jni')):
-        build['buildjni'] = 'yes'
+        build['buildjni'] = ['yes']
     app['builds'].append(build)
 
     # Keep the repo directory to save bandwidth...