From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 17 Apr 2014 18:39:47 +0000 (-0400)
Subject: if using crypto smartcard, remind user to plug it in
X-Git-Tag: 0.2~112^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1ca7949bb1237233f50a200eb0ab6959fe17769c;p=fdroidserver.git

if using crypto smartcard, remind user to plug it in
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b2d490b2..53c999a2 100644
--- 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)