Small buildjni= fixes

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index a6624bde7a573c3faaadd0c76ef72ae2d82fdb3c..1d11e9fe8e8d5462376f7a656fd22d2152644292 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -815,7 +815,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         nativecode = nativecode.strip()
         nativecode = None if not nativecode else nativecode
 
-    if thisbuild['buildjni'] != 'no':
+    if thisbuild['buildjni'] and thisbuild['buildjni'] != ['no']:
         if nativecode is not None:
             raise BuildException("Native code should have been built but none was packaged")
     if thisbuild['novcheck']:

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 76883f0f160b10a6e0d8a44fee1a1bd2fa285e96..a59137548ef3c03232917a5e1656e043c9934f14 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1456,7 +1456,7 @@ def scan_source(build_dir, root_dir, thisbuild):
     # buildjni=no to bypass this check)
     if (os.path.exists(os.path.join(root_dir, 'jni')) and
             not thisbuild['buildjni']):
-        logging.error('Found jni directory, but buildjni is not enabled')
+        logging.error('Found jni directory, but buildjni is not enabled. Set it to \'no\' to ignore.')
         count += 1
 
     return count