Show More
@@ -48,7 +48,6 b' class gpg(object):' | |||
|
48 | 48 | pass |
|
49 | 49 | keys = [] |
|
50 | 50 | key, fingerprint = None, None |
|
51 | err = "" | |
|
52 | 51 | for l in ret.splitlines(): |
|
53 | 52 | # see DETAILS in the gnupg documentation |
|
54 | 53 | # filter the logger output |
@@ -70,11 +69,9 b' class gpg(object):' | |||
|
70 | 69 | keys.append(key + [fingerprint]) |
|
71 | 70 | key = l.split(" ", 2) |
|
72 | 71 | fingerprint = None |
|
73 | if err: | |
|
74 | return err, [] | |
|
75 | 72 | if key is not None: |
|
76 | 73 | keys.append(key + [fingerprint]) |
|
77 |
return |
|
|
74 | return keys | |
|
78 | 75 | |
|
79 | 76 | def newgpg(ui, **opts): |
|
80 | 77 | """create a new gpg instance""" |
@@ -120,10 +117,7 b' def getkeys(ui, repo, mygpg, sigdata, co' | |||
|
120 | 117 | |
|
121 | 118 | data = node2txt(repo, node, version) |
|
122 | 119 | sig = binascii.a2b_base64(sig) |
|
123 |
|
|
|
124 | if err: | |
|
125 | ui.warn("%s:%d %s\n" % (fn, ln , err)) | |
|
126 | return None | |
|
120 | keys = mygpg.verify(data, sig) | |
|
127 | 121 | |
|
128 | 122 | validkeys = [] |
|
129 | 123 | # warn for expired key and/or sigs |
General Comments 0
You need to be logged in to leave comments.
Login now