Commit 006a2958 authored by anarcat's avatar anarcat
Browse files

skip keys without uids (Closes: #723152) 

notice how we unconditionnally set uidslist now - not sure why we were doing that before
parent 7c774efe

monkeysign/gpg.py

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ class OpenPGPkey(): 
                pass

            else:

                raise NotImplementedError(_("record type '%s' not implemented") % rectype)

        if uidslist: self.uidslist = uidslist

        self.uidslist = uidslist





    def __str__(self):

monkeysign/gtkui.py

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ class MonkeysignScan(gtk.Window): 
                for key in Keyring().get_keys(None, True, False).values():

                        if key.invalid or key.disabled or key.expired or key.revoked:

                                continue

                        # weird key without uids, skip (see BTS#723152)

                        if not key.uidslist:

                                continue

                        uid = key.uidslist[0].uid

                        self.uimanager.add_ui(self.uimanager.new_merge_id(), '/menu/identity', key.fpr, key.fpr, gtk.UI_MANAGER_AUTO, True)

                        action = gtk.RadioAction(key.fpr, "%s (%s)" % (uid, key.keyid()), str(key), None, i)