Control: tags -1 +patch

I believe the attached patch will fix the problem.

From 330a9e6cbdd04475cea53122e12496f4e99e0104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anar...@koumbit.org>
Date: Tue, 25 Nov 2014 22:29:12 -0500
Subject: [PATCH] try to handle error when import actually works in GTK UI
 (closes #770900)

---
 monkeysign/gtkui.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/monkeysign/gtkui.py b/monkeysign/gtkui.py
index 94a9824..de2a9cb 100644
--- a/monkeysign/gtkui.py
+++ b/monkeysign/gtkui.py
@@ -478,7 +478,14 @@ def watch_out_callback(self, pid, condition):
                 """callback invoked when gpg key download is finished
                 """
                 self.keep_pulsing=False
-                self.dialog.destroy()
+                try:
+                        self.dialog.destroy()
+                except AttributeError:
+                        # XXX: this should be handled better, bugfix for:
+                        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770900
+                        # this is actually because the key was
+                        # imported without having to create a dialog
+                        pass
                 self.msui.log(_('fetching finished'))
                 if condition == 0:
                         # 2. copy the signing key secrets into the keyring
-- 
2.1.1

Can you confirm?

Thanks,

A.

-- 
Any sufficiently advanced technology is indistinguishable from magic.
                        - Arthur C. Clarke

Attachment: signature.asc
Description: PGP signature

Reply via email to