From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 6 Jan 2015 13:40:31 +0000 (+0100)
Subject: Don't allow --skip-scan if scandelete is set up
X-Git-Tag: 0.4.0~165
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9b200f47d85c4532491aa1dc3c178513d7a7f4da;p=fdroidserver.git

Don't allow --skip-scan if scandelete is set up
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index b942c28e..f83ab430 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -534,7 +534,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
             if 'gradle' in dirs:
                 shutil.rmtree(os.path.join(root, 'gradle'))
 
-    if not options.skipscan:
+    if options.skipscan:
+        if thisbuild['scandelete']:
+            raise BuildException("Refusing to skip source scan since scandelete is present")
+    else:
         # Scan before building...
         logging.info("Scanning source for common problems...")
         count = common.scan_source(build_dir, root_dir, thisbuild)