User: Fix @gpg remove with some gpg configs.

2014-08-29 16:17:18 +00:00 · 2014-08-29 16:17:18 +00:00 · e6d80f9346
parent 06b865597f
commit e6d80f9346
1 changed files with 4 additions and 1 deletions
--- a/plugins/User/plugin.py
+++ b/plugins/User/plugin.py
@ -454,7 +454,10 @@ class User(callbacks.Plugin):
                if len(keyids) == 0:
                    raise ValueError
                for keyid in keyids:
-                    user.gpgkeys.remove(keyid)
+                    try:
+                        user.gpgkeys.remove(keyid)
+                    except ValueError:
+                        user.gpgkeys.remove('0x' + keyid)
                gpg.keyring.delete_keys(fingerprint)
                irc.replySuccess()
            except ValueError: