From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 6 Dec 2017 22:20:00 +0000 (+0100)
Subject: nightly: prompt user to create a debug.keystore if its not there
X-Git-Tag: 1.0.0~37^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5d56841f8a73824289ccbefa948d3c906cc44302;hp=c823d4c4a8e7ab6adcca5d5620e4fc6b6061eb59;p=fdroidserver.git

nightly: prompt user to create a debug.keystore if its not there

#423
---

diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index 37d3e8be..d4e4a4e3 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -290,6 +290,16 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
             shutil.rmtree(os.path.dirname(ssh_private_key_file))
 
     else:
+        if not os.path.isfile(KEYSTORE_FILE):
+            androiddir = os.path.dirname(KEYSTORE_FILE)
+            if not os.path.exists(androiddir):
+                os.mkdir(androiddir)
+                logging.info(_('created {path}').format(path=androiddir))
+            logging.error(_('{path} does not exist!  Create it by running:').format(path=KEYSTORE_FILE)
+                          + '\n    keytool -genkey -v -keystore ' + KEYSTORE_FILE + ' -storepass android \\'
+                          + '\n     -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 \\'
+                          + '\n     -dname "CN=Android Debug,O=Android,C=US"')
+            sys.exit(1)
         ssh_dir = os.path.join(os.getenv('HOME'), '.ssh')
         os.makedirs(os.path.dirname(ssh_dir), exist_ok=True)
         privkey = _ssh_key_from_debug_keystore()