From 1b0fb05337f7498c93302317d1be7751fdd62339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 30 Jan 2014 00:16:03 +0100 Subject: [PATCH] Handle dirs to be ignored in scan_source more gracefully --- fdroidserver/common.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b348af1f..4e451cd2 100644 --- 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)