From 9e9d016d906a2fbb1015883197ae204b0fcf0af5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 8 Jun 2012 18:52:27 +0000
Subject: (copy_removable) gtkdialogs (and thus /usr/bin/gmessage) is not
 packaged in Mga

---
 NEWS  | 1 +
 urpmi | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 0d96c62b..9b492de4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 - fix testsuite regressions
 - o make 'basename' option work again for rpmdrake
 - urpmi:
+  o do not try to run gmessage as gtkdialogs is not packaged in Mga
   o heavy refactorization
 - urpmf:
   o fix -m option not showing media names (mga#5916)
diff --git a/urpmi b/urpmi
index 74df18ff..a8b3f2d3 100755
--- a/urpmi
+++ b/urpmi
@@ -635,13 +635,6 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
 				     \@ask_unselect, \%requested, {
     (!$urpm->{options}{auto} || $allow_medium_change ? (copy_removable =>  sub {
 	my $msg = N("Please insert the medium named \"%s\"", $_[0]);
-	if ($ENV{DISPLAY} && $::gui) {
-	    #- probably run from a drakx
-	    my $gmessage = '/usr/bin/gmessage';
-	    if (-x $gmessage) {
-		return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', "\n$msg\n");
-	    }
-	}
 	if (eval { require Hal::Cdroms; 1 }) {
 	    print "$msg\n";
 	    Hal::Cdroms->new->wait_for_insert;
-- 
cgit v1.2.1