From f38619ef5fbcad293a63fce0c53991fda14d609e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 31 Jul 2015 15:54:50 +0200 Subject: [PATCH] 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. --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'],