Skip to content
Snippets Groups Projects
Commit 33c72f05 authored by Wei, Elson's avatar Wei, Elson
Browse files

gpg: getkeys() removes unused returning value "err"

parent 8b312c08
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,6 @@
pass
keys = []
key, fingerprint = None, None
err = ""
for l in ret.splitlines():
# see DETAILS in the gnupg documentation
# filter the logger output
......@@ -70,7 +69,5 @@
keys.append(key + [fingerprint])
key = l.split(" ", 2)
fingerprint = None
if err:
return err, []
if key is not None:
keys.append(key + [fingerprint])
......@@ -75,6 +72,6 @@
if key is not None:
keys.append(key + [fingerprint])
return err, keys
return keys
def newgpg(ui, **opts):
"""create a new gpg instance"""
......@@ -120,10 +117,7 @@
data = node2txt(repo, node, version)
sig = binascii.a2b_base64(sig)
err, keys = mygpg.verify(data, sig)
if err:
ui.warn("%s:%d %s\n" % (fn, ln , err))
return None
keys = mygpg.verify(data, sig)
validkeys = []
# warn for expired key and/or sigs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment