Fix init with common, don't require cwd in FDroidPopen

fdroidserver/common.py

@@ -1910,7 +1910,7 @@ class PopenResult:
     stderr = ''
     stdout_apk = ''
 
-def FDroidPopen(commands, cwd):
+def FDroidPopen(commands, cwd=None):
     """
     Runs a command the FDroid way and returns return code and output
 
@@ -1918,6 +1918,7 @@ def FDroidPopen(commands, cwd):
     """
 
     if options.verbose:
+        if cwd is not None:
             print "Directory: %s" % cwd
         print " > %s" % ' '.join(commands)
 

fdroidserver/init.py

@@ -29,6 +29,7 @@ import sys
 from optparse import OptionParser
 
 import common
+from common import FDroidPopen, BuildException
 
 
 config = {}
@@ -56,18 +57,15 @@ def genpassword():
 def genkey(keystore, repo_keyalias, password, keydname):
     '''generate a new keystore with a new key in it for signing repos'''
     print('Generating a new key in "' + keystore + '"...')
-    p = subprocess.Popen(['keytool', '-genkey',
+    p = FDroidPopen(['keytool', '-genkey',
                 '-keystore', keystore, '-alias', repo_keyalias,
                 '-keyalg', 'RSA', '-keysize', '4096',
                 '-sigalg', 'SHA256withRSA',
                 '-validity', '10000',
                 '-storepass', password, '-keypass', password,
-                          '-dname', keydname],
-                         stdout=subprocess.PIPE)
-    output = p.communicate()[0]
-    print(output)
+                '-dname', keydname])
     if p.returncode != 0:
-        raise BuildException("Failed to generate key")
+        raise BuildException("Failed to generate key", p.stdout, p.stderr)
     # now show the lovely key that was just generated
     p = subprocess.Popen(['keytool', '-list', '-v',
                 '-keystore', keystore, '-alias', repo_keyalias],