From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 9 Jul 2014 17:11:13 +0000 (+0200)
Subject: Much cleaner and nicer way to ignore vcs dot dirs
X-Git-Tag: 0.2.1~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=69725c3f4cc4045769cb6dbf3d044bf2779fc485;p=fdroidserver.git

Much cleaner and nicer way to ignore vcs dot dirs

We now discard their entire subtree directly
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f4b51a27..37473bb7 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1456,14 +1456,13 @@ def scan_source(build_dir, root_dir, thisbuild):
             return True
         return False
 
-    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 r, d, f in os.walk(build_dir, topdown=True):
 
-        if any(insidedir(r, d) for d in ('.hg', '.git', '.svn', '.bzr')):
-            continue
+        # It's topdown, so checking the basename is enough
+        for ignoredir in ('.hg', '.git', '.svn', '.bzr'):
+            if ignoredir in d:
+                d.remove(ignoredir)
 
         for curfile in f: