From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 15 Jun 2014 10:30:03 +0000 (+0200)
Subject: Fix crash in 'fdroid import'
X-Git-Tag: 0.2~29
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fcface673eac5564269ee38f6d04b60d847c460e;p=fdroidserver.git

Fix crash in 'fdroid import'
---

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index c8b3bbdb..e055dd70 100644
--- 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...