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:
0f6cb94
)
Fix crash in 'fdroid import'
author
Daniel Martí
<mvdan@mvdan.cc>
Sun, 15 Jun 2014 10:30:03 +0000
(12:30 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Sun, 15 Jun 2014 10:30:03 +0000
(12:30 +0200)
fdroidserver/import.py
patch
|
blob
|
history
diff --git
a/fdroidserver/import.py
b/fdroidserver/import.py
index c8b3bbdb9ac3a827dd348b37bf0d3ee0b9532775..e055dd70dba0debc9d843fbce405fd04f3ba0d45 100644
(file)
--- a/
fdroidserver/import.py
+++ b/
fdroidserver/import.py
@@
-294,6
+294,12
@@
def main():
build['subdir'] = options.subdir
if os.path.exists(os.path.join(root_dir, 'jni')):
build['buildjni'] = ['yes']
+
+ for flag, value in metadata.flag_defaults.iteritems():
+ if flag in build:
+ continue
+ build[flag] = value
+
app['builds'].append(build)
# Keep the repo directory to save bandwidth...