From: Henrik Tunedal <tunedal@gmail.com>
Date: Sat, 26 Feb 2011 23:40:20 +0000 (+0100)
Subject: Remove key.store from default.properties as well
X-Git-Tag: 0.1~1456
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=09c5c5099339279c723c16b40fb856cf345e43d8;p=fdroidserver.git

Remove key.store from default.properties as well
---

diff --git a/build.py b/build.py
index 3f816d1a..16add9bf 100755
--- a/build.py
+++ b/build.py
@@ -202,11 +202,12 @@ for app in apps:
 
                 # If the app has ant set up to sign the release, we need to switch
                 # that off, because we want the unsigned apk...
-                if os.path.exists(os.path.join(root_dir, 'build.properties')):
-                    if subprocess.call(['sed','-i','s/^key.store/#/',
-                        'build.properties'], cwd=root_dir) !=0:
-                        print "Failed to amend build.properties"
-                        sys.exit(1)
+                for propfile in ('build.properties', 'default.properties'):
+                    if os.path.exists(os.path.join(root_dir, propfile)):
+                        if subprocess.call(['sed','-i','s/^key.store/#/',
+                                            propfile], cwd=root_dir) !=0:
+                            print "Failed to amend %s" % propfile
+                            sys.exit(1)
 
                 # Update the local.properties file...
                 locprops = os.path.join(root_dir, 'local.properties')