From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 17 Mar 2013 11:29:54 +0000 (+0100)
Subject: Better scan
X-Git-Tag: 0.1~672^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4f61623501be3ad617c104f7d4e2243a7dab17e2;p=fdroidserver.git

Better scan
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ee59f058..2a0ea00c 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1961,26 +1961,30 @@ def scan_source(build_dir, root_dir, thisbuild):
     for r,d,f in os.walk(build_dir):
         for curfile in f:
 
-            if r.find('/.hg/') == -1:
-
-                # Path (relative) to the file...
-                fp = os.path.join(r, curfile)
+            if r.find('/.hg') != -1 or r.find('/.git') != -1:
+                continue
 
-                for suspect in usual_suspects:
-                    if curfile.lower().find(suspect) != -1:
-                        msg = 'Found probable non-free blob ' + fp
-                        problems.append(msg)
+            # Path (relative) to the file...
+            fp = os.path.join(r, curfile)
 
-                if curfile.endswith('.apk'):
-                    msg = 'Found apk file, which should not be in the source - ' + fp
+            for suspect in usual_suspects:
+                if curfile.lower().find(suspect) != -1:
+                    msg = 'Found probable non-free blob ' + fp
                     problems.append(msg)
 
-                if curfile.endswith('.java'):
-                    for line in file(fp):
+            if curfile.endswith('.apk'):
+                msg = 'Found apk file, which should not be in the source - ' + fp
+                problems.append(msg)
 
-                        if line.find('DexClassLoader') != -1:
-                            msg = 'Found DexClassLoader in ' + fp
-                            problems.append(msg)
+            elif curfile.endswith('.so') or curfile.endswith('.elf'):
+                msg = 'Found ELF at ' + fp
+                problems.append(msg)
+
+            elif curfile.endswith('.java'):
+                for line in file(fp):
+                    if line.find('DexClassLoader') != -1:
+                        msg = 'Found DexClassLoader in ' + fp
+                        problems.append(msg)
 
     # Presence of a jni directory without buildjni=yes might
     # indicate a problem... (if it's not a problem, explicitly use