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