From cf919b18788df5ed01b43018941c262a51596dfe Mon Sep 17 00:00:00 2001 From: Olivier Thauvin Date: Wed, 14 Jan 2004 19:31:03 +0000 Subject: $root =~ s!/*!! to avoid root detection issue --- urpme | 3 +++ urpmi | 4 ++++ urpmq | 3 +++ 3 files changed, 10 insertions(+) diff --git a/urpme b/urpme index 1d6efb9c..59f1a610 100644 --- a/urpme +++ b/urpme @@ -68,6 +68,9 @@ while (defined($_ = shift @ARGV)) { push @l, $_; } +# We assume --root / is stupid (P. Terjan idea) +$root =~ s!^/*$!!; + my $urpm = new urpm; my $state = {}; diff --git a/urpmi b/urpmi index d496c2fa..4fd44977 100755 --- a/urpmi +++ b/urpmi @@ -238,6 +238,10 @@ while (defined($_ = shift @argv)) { } $src = 0; #- reset switch for next package. } + +# We assume --root / is stupid (P. Terjan idea) +$root =~ s!^/*$!!; + #- use install_src to promote all names as src package. if ($install_src) { @files and $urpm->{fatal}(1, N("What can be done with binary rpm files when using --install-src")); diff --git a/urpmq b/urpmq index 394c66a9..4abf1323 100755 --- a/urpmq +++ b/urpmq @@ -166,6 +166,9 @@ while (defined($_ = shift @ARGV)) { $query->{src} = 0; #- reset switch for next package. } +# We assume --root / is stupid (P. Terjan idea) +$root =~ s!^/*$!!; + #- remove verbose if not asked. $query->{verbose} or $urpm->{log} = sub {}; -- cgit v1.2.1