if using crypto smartcard, remind user to plug it in

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b2d490b2581e847898765307277debe005bc80ee..53c999a2f1194cfc1a7e7bb608e918ed7391a26f 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -645,7 +645,10 @@ def make_index(apps, apks, repodir, archive, categories):
                                   '-storepass:file', config['keystorepassfile']]
                             + config['smartcardoptions'])
             if p.returncode != 0:
-                logging.critical("Failed to get repo pubkey")
+                msg = "Failed to get repo pubkey!"
+                if config['keystore'] == 'NONE':
+                    msg += ' Is your crypto smartcard plugged in?'
+                logging.critical(msg)
                 sys.exit(1)
             global repo_pubkey_fingerprint
             repo_pubkey_fingerprint = cert_fingerprint(p.stdout)