From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 26 Aug 2014 11:49:42 +0000 (+0200)
Subject: Properly obey build --force. Fixes #29.
X-Git-Tag: 0.3.0~72
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cb63a5a62bf1c6b33643b672be91f201c69c1992;p=fdroidserver.git

Properly obey build --force. Fixes #29.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index b8671f8f..b38250e4 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -877,7 +877,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, also_check_dir, srclib_dir,
             if os.path.exists(dest_also):
                 return False
 
-    if thisbuild['disable']:
+    if thisbuild['disable'] and not options.force:
         return False
 
     logging.info("Building version %s (%s) of %s" % (
@@ -1000,7 +1000,7 @@ def main():
     if options.latest:
         for app in apps.itervalues():
             for build in reversed(app['builds']):
-                if build['disable']:
+                if build['disable'] and not options.force:
                     continue
                 app['builds'] = [build]
                 break