From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 21 Aug 2014 18:02:52 +0000 (+0200)
Subject: Make the scanner log scanignore as well
X-Git-Tag: 0.3.0~83
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=58a88acd92e0824bcecb90616370e8689212b622;p=fdroidserver.git

Make the scanner log scanignore as well
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index cc8cf5ec..faa1e767 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -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: