From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 31 Jul 2015 13:54:50 +0000 (+0200)
Subject: chmod keystore after checking whether it was created
X-Git-Tag: 0.4.0~8^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f38619ef5fbcad293a63fce0c53991fda14d609e;p=fdroidserver.git

chmod keystore after checking whether it was created

On OSX, when Java is not installed, it'll fail to create the keystore, but
then give an error from chmod failing.  This changes things so that the
missing Java is reported instead.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 4d6dff47..32db17d3 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -2051,9 +2051,9 @@ def genkeystore(localconfig):
                      '-keypass:file', config['keypassfile'],
                      '-dname', localconfig['keydname']])
     # TODO keypass should be sent via stdin
-    os.chmod(localconfig['keystore'], 0o0600)
     if p.returncode != 0:
         raise BuildException("Failed to generate key", p.output)
+    os.chmod(localconfig['keystore'], 0o0600)
     # now show the lovely key that was just generated
     p = FDroidPopen(['keytool', '-list', '-v',
                      '-keystore', localconfig['keystore'],