From d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 8 Jun 2012 18:52:17 +0000
Subject: drop /usr/X11R6/bin from $PATH

---
 urpmi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'urpmi')

diff --git a/urpmi b/urpmi
index e7a5ef89..d8f99de8 100755
--- a/urpmi
+++ b/urpmi
@@ -57,7 +57,7 @@ my @src_files;
 my @names;
 my @src_names;
 
-$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
+$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin";
 delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
 $ENV{HOME} ||= "/root";
 $ENV{USER} ||= "root";
@@ -637,8 +637,8 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
 	my $msg = N("Please insert the medium named \"%s\"", $_[0]);
 	if ($ENV{DISPLAY} && $::gui) {
 	    #- probably run from a drak tool
-	    (my $gmessage) = find { -x $_ } '/usr/X11R6/bin/gmessage', '/usr/bin/gmessage';
-	    if ($gmessage) {
+	    my $gmessage = '/usr/bin/gmessage';
+	    if (-x $gmessage) {
 		return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', "\n$msg\n");
 	    }
 	}
-- 
cgit v1.2.1