chiark / gitweb /
Avoid default cases in build types
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 28 Jan 2014 21:14:28 +0000 (22:14 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 28 Jan 2014 21:14:28 +0000 (22:14 +0100)
fdroidserver/build.py

index 3351271061455ff0ee6e345d02641be4a209339a..109425ccdcf82c9785ada43aa39fe73f72667b22 100644 (file)
@@ -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,