- fix "packages have bad signature dialog": really display a yes/no

  question! :)
- fix not removing gurpm dialog when exiting package installation with
  an error

2 files changed, 8 insertions, 3 deletions

diff --git a/rpmdrake b/rpmdrake
index 00421431..33c2e5ec 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1010,9 +1010,9 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
             gurpm::progress(++$progress/$total);
         }
         if (@invalid_sources) {
-            interactive_msg('rpmdrake',
-                            N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?",
-                              join "\n", @invalid_sources)) or goto return_with_error;
+            interactive_msg_('rpmdrake',
+                             N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?",
+                               join "\n", @invalid_sources), yesno => 1) or goto return_with_error;
         }
     }
 
@@ -1080,6 +1080,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
     interactive_msg_(N("Installation failed"),
                      N("There was a problem during the installation:\n\n%s", $fatal_msg));
   return_with_error:
+    gurpm::end();
     $w->{rwindow}->set_sensitive(1);
     return 1;
 }
diff --git a/rpmdrake.spec b/rpmdrake.spec
index b642a1ca..6209f19f 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -103,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri May 16 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-20mdk
 - perl-URPM API change: gives architecture in ask_remove
+- fix "packages have bad signature dialog": really display a yes/no
+  question! :)
+- fix not removing gurpm dialog when exiting package installation with
+  an error
 - fix #3908 (garbage chars displayed as date in changelog entries in
   removal mode)