mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Make the scanner log scanignore as well
This commit is contained in:
parent
c5cab888e4
commit
58a88acd92
@ -1438,7 +1438,9 @@ def scan_source(build_dir, root_dir, thisbuild):
|
||||
logging.warn('Found %s at %s' % (what, fd))
|
||||
|
||||
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)
|
||||
else:
|
||||
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)
|
||||
fd = fp[len(build_dir) + 1:]
|
||||
|
||||
# Check if this file has been explicitly excluded from scanning
|
||||
if toignore(fd):
|
||||
continue
|
||||
|
||||
try:
|
||||
mime = magic.from_file(fp, mime=True) if ms is None else ms.file(fp)
|
||||
except UnicodeError:
|
||||
|
Loading…
Reference in New Issue
Block a user