changeset 766186a69e2f in /home/hg/repos/gajim
author: Yann Leboulanger <aste...@lagaule.org>
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=766186a69e2f
description: update python-gnupg version. Fixes #8051
diffstat:
src/common/gnupg.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (45 lines):
diff -r 8b1276a8a6c3 -r 766186a69e2f src/common/gnupg.py
--- a/src/common/gnupg.py Sun May 17 15:40:42 2015 +0200
+++ b/src/common/gnupg.py Sun May 17 18:54:17 2015 +0200
@@ -229,7 +229,7 @@
"DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR",
"FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC",
"GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA",
- "PROGRESS"):
+ "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"):
pass
elif key == "BADSIG":
self.valid = False
@@ -509,7 +509,8 @@
def handle_status(self, key, value):
if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION",
"BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS",
- "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS"):
+ "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS",
+ "PINENTRY_LAUNCHED"):
# in the case of ERROR, this is because a more specific error
# message will have come first
pass
@@ -557,7 +558,8 @@
return self.fingerprint or ''
def handle_status(self, key, value):
- if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED"):
+ if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED",
+ "PINENTRY_LAUNCHED"):
pass
elif key == "KEY_CREATED":
(self.type,self.fingerprint) = value.split()
@@ -1202,10 +1204,8 @@
parms.setdefault('Key-Type','RSA')
parms.setdefault('Key-Length',2048)
parms.setdefault('Name-Real', "Autogenerated Key")
- try:
- logname = os.environ['LOGNAME']
- except KeyError:
- logname = os.environ['USERNAME']
+ logname = (os.environ.get('LOGNAME') or os.environ.get('USERNAME') or
+ 'unspecified')
hostname = socket.gethostname()
parms.setdefault('Name-Email', "%s@%s" % (logname.replace(' ', '_'),
hostname))
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
