summaryrefslogtreecommitdiffstats
path: root/urpmi
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-08 18:52:17 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-08 18:52:17 +0000
commitd976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e (patch)
treece78696ac34e280e8393b381cdd87955d8ee4775 /urpmi
parent1734ec1d100bcc65a7e80c0c93285738365a9ae8 (diff)
downloadurpmi-d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e.tar
urpmi-d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e.tar.gz
urpmi-d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e.tar.bz2
urpmi-d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e.tar.xz
urpmi-d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e.zip
drop /usr/X11R6/bin from $PATH
Diffstat (limited to 'urpmi')
-rwxr-xr-xurpmi6
1 files changed, 3 insertions, 3 deletions
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");
}
}