summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-02-05 12:47:42 +0000
committerFrancois Pons <fpons@mandriva.com>2001-02-05 12:47:42 +0000
commit66954e5745ec024402660d4a7559eaf7e7fc9ae2 (patch)
treea62244e4ead21866041f8489c09e393923656368 /perl-install
parent5def8a49fdf652af9e53ef815bd494445c1d75e7 (diff)
downloaddrakx-66954e5745ec024402660d4a7559eaf7e7fc9ae2.tar
drakx-66954e5745ec024402660d4a7559eaf7e7fc9ae2.tar.gz
drakx-66954e5745ec024402660d4a7559eaf7e7fc9ae2.tar.bz2
drakx-66954e5745ec024402660d4a7559eaf7e7fc9ae2.tar.xz
drakx-66954e5745ec024402660d4a7559eaf7e7fc9ae2.zip
updated to use urpmi new format (change fakemedium to better label)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/pkgs.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b8ea543b4..f6799bcec 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -419,6 +419,7 @@ sub install_urpmi {
close FILES or log::l("parsehdlist failed"), return;
close LIST;
+ $name =~ s/(\s)/\\$1 /g; $dir =~ s/(\s)/\\$1/g; #- necessary to change protect white char, for urpmi >= 1.40
$dir .= " with ../base/$_->{hdlist}" if $method =~ /ftp|http/;
"$name $dir\n";
} values %$mediums;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index b6e7de82b..0baccea9e 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -346,7 +346,7 @@ sub psUpdateHdlistsDeps {
#- copy hdlist file directly to $prefix/var/lib/urpmi, this will be used
#- for getting header of package during installation or after by urpmi.
- my $fakemedium = $method . $medium;
+ my $fakemedium = "$descr ($method$medium)";
my $newf = "$prefix/var/lib/urpmi/hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
-e $newf and do { unlink $newf or die "cannot remove $newf: $!"; };
install_any::getAndSaveFile("Mandrake/base/$hdlist", $newf) or die "no $hdlist found";
@@ -387,7 +387,7 @@ sub psUsingHdlists {
sub psUsingHdlist {
my ($prefix, $method, $packages, $hdlist, $medium, $rpmsdir, $descr, $selected, $fhdlist) = @_;
- my $fakemedium = $method . $medium;
+ my $fakemedium = "$descr ($method$medium)";
log::l("trying to read $hdlist for medium $medium");
#- if the medium already exist, use it.