From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 24 Jun 2014 20:09:05 +0000 (+0200)
Subject: Don't error about native code if buildjni=no
X-Git-Tag: 0.2~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=53aba5365f8a9c191661a0ef4c1af53c5c4e22bc;p=fdroidserver.git

Don't error about native code if buildjni=no
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 55b2b8d6..a6624bde 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -809,8 +809,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         elif line.startswith("native-code:"):
             nativecode = line[12:]
 
-    if thisbuild['buildjni']:
-        if nativecode is None or "'" not in nativecode:
+    # Ignore empty strings or any kind of space/newline chars that we don't
+    # care about
+    if nativecode is not None:
+        nativecode = nativecode.strip()
+        nativecode = None if not nativecode else nativecode
+
+    if thisbuild['buildjni'] != 'no':
+        if nativecode is not None:
             raise BuildException("Native code should have been built but none was packaged")
     if thisbuild['novcheck']:
         vercode = thisbuild['vercode']