chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b50566
)
Don't crash when using gradle=yes
author
Daniel Martí
<mvdan@mvdan.cc>
Wed, 19 Mar 2014 16:25:57 +0000
(17:25 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Wed, 19 Mar 2014 16:25:57 +0000
(17:25 +0100)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 2155ec814b0d25fb0f9f18cccb5906671c25b711..8c5f116117ffde455e72278e441f7415e2d1106c 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-613,8
+613,11
@@
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
commands = [config['gradle']]
if 'preassemble' in thisbuild:
commands += thisbuild['preassemble'].split()
+
flavours_cmd = ''.join(flavours)
- flavours_cmd = flavours_cmd[0].upper() + flavours_cmd[1:]
+ if flavours_cmd:
+ flavours_cmd = flavours_cmd[0].upper() + flavours_cmd[1:]
+
commands += ['assemble'+flavours_cmd+'Release']
p = FDroidPopen(commands, cwd=gradle_dir)