From e6d80f9346d8e3aabf753f6cf04ae36ffe9cbba7 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Fri, 29 Aug 2014 16:17:18 +0000 Subject: [PATCH] User: Fix @gpg remove with some gpg configs. --- plugins/User/plugin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py index f18f1440b..890a3946f 100644 --- 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: