mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Handle dirs to be ignored in scan_source more gracefully
This commit is contained in:
parent
3f47b4914d
commit
1b0fb05337
@ -1241,12 +1241,17 @@ def scan_source(build_dir, root_dir, thisbuild):
|
|||||||
def warnproblem(what, fd, fp):
|
def warnproblem(what, fd, fp):
|
||||||
print 'Warning: Found %s at %s' % (what, fd)
|
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...
|
# 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):
|
||||||
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')):
|
||||||
continue
|
print r
|
||||||
|
continue
|
||||||
|
|
||||||
|
for curfile in f:
|
||||||
|
|
||||||
# Path (relative) to the file...
|
# Path (relative) to the file...
|
||||||
fp = os.path.join(r, curfile)
|
fp = os.path.join(r, curfile)
|
||||||
|
Loading…
Reference in New Issue
Block a user