From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 28 Jan 2014 21:14:28 +0000 (+0100)
Subject: Avoid default cases in build types
X-Git-Tag: 0.2~341^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8bbe38f172de51d3efaff5fead9ac1f2eadbf973;p=fdroidserver.git

Avoid default cases in build types
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 33512710..109425cc 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -607,7 +607,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         p = FDroidPopen(commands, cwd=gradle_dir)
 
-    else:
+    elif thisbuild['type'] == 'ant':
         print "Building Ant project..."
         cmd = ['ant']
         if 'antcommand' in thisbuild:
@@ -649,7 +649,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         else:
             name = '-'.join([os.path.basename(dd), '-'.join(flavours), 'release', 'unsigned'])
         src = os.path.join(dd, 'build', 'apk', name+'.apk')
-    else:
+    elif thisbuild['type'] == 'ant':
         stdout_apk = '\n'.join([
             line for line in p.stdout.splitlines() if '.apk' in line])
         src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk,