chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3829d37
)
warn user if smartcard keystore is set but opensc is not installed
author
Hans-Christoph Steiner
<hans@eds.org>
Fri, 4 Apr 2014 04:15:47 +0000
(
00:15
-0400)
committer
Hans-Christoph Steiner
<hans@eds.org>
Mon, 7 Apr 2014 20:00:18 +0000
(16:00 -0400)
fdroidserver/init.py
patch
|
blob
|
history
diff --git
a/fdroidserver/init.py
b/fdroidserver/init.py
index 9571d401b4e4bbbebc1f969d775f272bfb629f4f..0d2d847e59c0a5a10312107cc7cd072c0ffb04cf 100644
(file)
--- 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,