From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 24 Jun 2014 20:31:39 +0000 (+0200)
Subject: Small buildjni= fixes
X-Git-Tag: 0.2~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2c8df2c1ef970c2070e768a80d2b6f85e6c8fd46;p=fdroidserver.git

Small buildjni= fixes
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index a6624bde..1d11e9fe 100644
--- 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 76883f0f..a5913754 100644
--- 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