1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 06:20:12 +01:00

Handle dirs to be ignored in scan_source more gracefully

This commit is contained in:
Daniel Martí 2014-01-30 00:16:03 +01:00
parent 3f47b4914d
commit 1b0fb05337

View File

@ -1241,13 +1241,18 @@ 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:
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)
fd = fp[len(build_dir):]