chiark / gitweb /
Exclude .hg directory from scans, it can contain jars that were removed
authorCiaran Gultnieks <ciaran@ciarang.com>
Tue, 6 Mar 2012 19:54:37 +0000 (19:54 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Tue, 6 Mar 2012 19:54:37 +0000 (19:54 +0000)
common.py

index f2cb00b5e29560b78a2ff5ca30d4c278b4c962a9..1916c9ccf4841d6301538def168fe195b79706a4 100644 (file)
--- a/common.py
+++ b/common.py
@@ -950,24 +950,26 @@ def scan_source(build_dir, root_dir, thisbuild):
     for r,d,f in os.walk(build_dir):
         for curfile in f:
 
-            # Path (relative) to the file...
-            fp = os.path.join(r, curfile)
+            if r.find('/.hg/') == -1:
 
-            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('.java'):
-                for line in file(fp):
-
-                    if line.find('DexClassLoader') != -1:
-                        msg = 'Found DexClassLoader in ' + fp
+                for suspect in usual_suspects:
+                    if curfile.lower().find(suspect) != -1:
+                        msg = 'Found probable non-free blob ' + fp
                         problems.append(msg)
 
-                    if line.lower().find('all rights reserved') != -1:
-                        msg = 'All rights reserved in ' + fp
-                        problems.append(msg)
+                if curfile.endswith('.java'):
+                    for line in file(fp):
+
+                        if line.find('DexClassLoader') != -1:
+                            msg = 'Found DexClassLoader in ' + fp
+                            problems.append(msg)
+
+                        if line.lower().find('all rights reserved') != -1:
+                            msg = 'All rights reserved in ' + fp
+                            problems.append(msg)
 
     # Presence of a jni directory without buildjni=yes might
     # indicate a problem...