summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2002-08-26 09:30:35 +0000
committerFlorent Villard <warly@mandriva.com>2002-08-26 09:30:35 +0000
commit177e317f4a5a57ca27b13cea579704edd1f62e28 (patch)
tree8ec165da8a967cdbe21dd441ce58dd59c149ad02
parentbe19074449fca20fab3e909963bf9cfacf68d5ac (diff)
downloadurpmi-177e317f4a5a57ca27b13cea579704edd1f62e28.tar
urpmi-177e317f4a5a57ca27b13cea579704edd1f62e28.tar.gz
urpmi-177e317f4a5a57ca27b13cea579704edd1f62e28.tar.bz2
urpmi-177e317f4a5a57ca27b13cea579704edd1f62e28.tar.xz
urpmi-177e317f4a5a57ca27b13cea579704edd1f62e28.zip
remove ´/´ in install call in urpme
-rw-r--r--urpm.pm1
-rw-r--r--urpme2
-rw-r--r--urpmi.spec5
3 files changed, 6 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 67fc1a7a..2ce9d9d1 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1445,6 +1445,7 @@ sub reduce_pathname {
#- remove any multiple /s or trailing /.
#- then split all components of pathname.
$dir =~ s/\/+/\//g; $dir =~ s/\/$//;
+ $dir =~ s/([^:]+:\/)?\/+/$1\//g; $dir =~ s/\/$//;
my @paths = split '/', $dir;
#- reset $dir, recompose it, and clean trailing / added by algorithm.
diff --git a/urpme b/urpme
index 395f8254..675098e2 100644
--- a/urpme
+++ b/urpme
@@ -127,7 +127,7 @@ if (@toremove > @l && !$auto) {
<STDIN> =~ /[$noexpr]/ and exit 0;
}
-$urpm->install('/', \@toremove, {}, {});
+$urpm->install(\@toremove, {}, {});
sub toMb {
my $nb = $_[0] / 1024 / 1024;
diff --git a/urpmi.spec b/urpmi.spec
index 19305fbe..fde88737 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.0
-Release: 2mdk
+Release: 3mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -175,6 +175,9 @@ fi
%changelog
+* Fri Aug 23 2002 Warly <warly@mandrakesoft.com> 4.0-3mdk
+- fix urpme '/' pb
+
* Fri Aug 23 2002 François Pons <fpons@mandrakesoft.com> 4.0-2mdk
- added ssh parallel module extension.
- fixed check of capabilities of distant urpmi.