From 6b918b17c3dbecf6ae23e8dbcf569275f077f8a5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 26 Mar 2007 11:08:49 +0000
Subject: (get_pkgs) simplify

---
 Rpmdrake/pkg.pm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index c8e63cb0..200ece85 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -226,20 +226,17 @@ sub get_pkgs {
     @update_medias = ();
     my $w = $::main_window;
 
-    my $error_happened;
-    my $fatal_handler = sub {
-        $error_happened = 1;
-        interactive_msg(N("Fatal error"),
-                         N("A fatal error occurred: %s.", $_[1]));
-        myexit(-1) if 0; #FIXME
-    };
-
     Rpmdrake::gurpm::init(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::main_window);
     my $_guard = before_leaving { Rpmdrake::gurpm::end() };
     my $_flush_guard = Gtk2::GUI_Update_Guard->new;
 
+    my $error_happened;
     $urpm = urpm->new;
-    $urpm->{fatal} = $fatal_handler;
+    $urpm->{fatal} = sub {
+        $error_happened = 1;
+        interactive_msg(N("Fatal error"),
+                         N("A fatal error occurred: %s.", $_[1]));
+    };
     my $media = ref $::options{media} ? join(',', @{$::options{media}}) : '';
     urpm::media::configure($urpm, media => $media);
     if ($error_happened) {
-- 
cgit v1.2.1