From aec3a06cb3d0fe1a9aab2f6184654a16cdd612b5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 26 Mar 2009 13:25:25 +0000
Subject: (urpmi_add_all_media) make gurpmi.addmedia auto close instead of
 waiting for user pressing "close" button on "media added with success"
 dialogs

---
 perl-install/any.pm       | 4 +++-
 perl-install/install/NEWS | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 9b2730c0f..8a547e0d4 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -858,9 +858,11 @@ sub urpmi_add_all_media {
     require network::tools;
     return if !network::tools::has_network_connection();
     my $wait;
+    my @options = ('--distrib', '--mirrorlist', '$MIRRORLIST');
     if ($binary eq 'urpmi.addmedia') {
 	$wait = $in->wait_message(N("Please wait"), N("Please wait, adding media..."));
     } elsif ($in->isa('interactive::gtk')) {
+	push @options, '--silent-success';
 	mygtk2::flush();
     }
 
@@ -870,7 +872,7 @@ sub urpmi_add_all_media {
     log::l("URPMI_ADDMEDIA_REASON $reason");
     local $ENV{URPMI_ADDMEDIA_REASON} = $reason;
 
-    run_program::rooted($::prefix, $binary, '--distrib', '--mirrorlist', '$MIRRORLIST');
+    run_program::rooted($::prefix, $binary, @options);
 }
 
 sub autologin {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b10f5b8bb..85218abae 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,9 @@
 - adjust partition size suggestion
   o increase / size to 12GB (instead of 8)
   o create separate /home starting at 13GB drives (instead of 7)
+- when setting update media, make gurpmi.addmedia auto close instead
+  of waiting for user pressing "close" button on "media added with
+  success" dialogs
 
 Version 12.18 - 24 March 2009
 
-- 
cgit v1.2.1