Handle dirs to be ignored in scan_source more gracefully

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b348af1f1836077885f7600935a36df97f4976ab..4e451cd2d15dc9e80b9a70a830a2f2813746e6a5 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1241,12 +1241,17 @@ def scan_source(build_dir, root_dir, thisbuild):
     def warnproblem(what, fd, fp):
         print 'Warning: Found %s at %s' % (what, fd)
 
+    def insidedir(path, dirname):
+        return path.endswith('/%s' % dirname) or '/%s/' % dirname in path
+
     # Iterate through all files in the source code...
     for r,d,f in os.walk(build_dir):
-        for curfile in f:
 
-            if '/.hg' in r or '/.git' in r or '/.svn' in r:
-                continue
+        if any(insidedir(r, igndir) for igndir in ('.hg', '.git', '.svn')):
+            print r
+            continue
+
+        for curfile in f:
 
             # Path (relative) to the file...
             fp = os.path.join(r, curfile)