mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the scanner log scanignore as well

Browse source
This commit is contained in:
Daniel Martí 2014-08-21 20:02:52 +02:00
parent c5cab888e4
commit 58a88acd92
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/common.py
View file

@ -1438,7 +1438,9 @@ def scan_source(build_dir, root_dir, thisbuild):
logging.warn('Found %s at %s' % (what, fd)) logging.warn('Found %s at %s' % (what, fd))
def handleproblem(what, fd, fp): def handleproblem(what, fd, fp):
if todelete(fd): if toignore(fd):
logging.info('Ignoring %s at %s' % (what, fd))
elif todelete(fd):
removeproblem(what, fd, fp) removeproblem(what, fd, fp)
else: else:
logging.error('Found %s at %s' % (what, fd)) logging.error('Found %s at %s' % (what, fd))
@ -1459,10 +1461,6 @@ def scan_source(build_dir, root_dir, thisbuild):
fp = os.path.join(r, curfile) fp = os.path.join(r, curfile)
fd = fp[len(build_dir) + 1:] fd = fp[len(build_dir) + 1:]
# Check if this file has been explicitly excluded from scanning
if toignore(fd):
continue
try: try:
mime = magic.from_file(fp, mime=True) if ms is None else ms.file(fp) mime = magic.from_file(fp, mime=True) if ms is None else ms.file(fp)
except UnicodeError: except UnicodeError: