From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 4 Apr 2014 04:15:47 +0000 (-0400)
Subject: warn user if smartcard keystore is set but opensc is not installed
X-Git-Tag: 0.2~141^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00b89c05c548d19e9786cde2b5356ef7c8bb84ef;p=fdroidserver.git

warn user if smartcard keystore is set but opensc is not installed
---

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 9571d401..0d2d847e 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -224,6 +224,10 @@ def main():
                 files = glob.glob('/usr/lib/' + os.uname()[4] + '-*-gnu/opensc-pkcs11.so')
                 if len(files) > 0:
                     opensc_so = files[0]
+                else:
+                    opensc_so = '/usr/lib/opensc-pkcs11.so'
+                    logging.warn('No OpenSC PKCS#11 module found, ' +
+                                 'install OpenSC then edit "opensc-fdroid.cfg"!')
             with open(os.path.join(examplesdir, 'opensc-fdroid.cfg'), 'r') as f:
                 opensc_fdroid = f.read()
             opensc_fdroid = re.sub('^library.*', 'library = ' + opensc_so, opensc_fdroid,