mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Much cleaner and nicer way to ignore vcs dot dirs

Browse source 
We now discard their entire subtree directly
This commit is contained in:
Daniel Martí 2014-07-09 19:11:13 +02:00
parent f3dd6d9510
commit 69725c3f4c
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/common.py
View file

@ -1456,14 +1456,13 @@ def scan_source(build_dir, root_dir, thisbuild):
return True return True
return False return False
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, topdown=True):
if any(insidedir(r, d) for d in ('.hg', '.git', '.svn', '.bzr')): # It's topdown, so checking the basename is enough
continue for ignoredir in ('.hg', '.git', '.svn', '.bzr'):
if ignoredir in d:
d.remove(ignoredir)
for curfile in f: for curfile in f: