From 0b6c59b204b8572b6d36f46559b8a410d4382cee Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 22 Sep 2004 07:48:45 +0000 Subject: Fix variable name --- perl-install/pkgs.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 66f2569dd..56c89ed03 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -472,13 +472,13 @@ sub psUsingHdlist { } #- integrate medium in media list, only here to avoid download error (update) to be propagated. - $packages->{mediums}{$medium} = $m; + $packages->{mediums}{$medium_name} = $m; #- avoid using more than one medium if Cd is not ejectable. #- but keep all medium here so that urpmi has the whole set. $m->{ignored} ||= ( - $method eq 'cdrom' && $medium > 1 #- first cdrom - && $medium !~ /^\d+s/ #- not a suppl. CD + install_any::method_allows_medium_change($method) && $medium_name > 1 #- first cdrom + && $medium_name !~ /^\d+s/ #- not a suppl. CD && !common::usingRamdisk()); #- parse synthesis (if available) of directly hdlist (with packing). @@ -490,12 +490,12 @@ sub psUsingHdlist { } elsif (-s $newf) { ($m->{start}, $m->{end}) = $packages->parse_hdlist($newf, 1); } else { - delete $packages->{mediums}{$medium}; + delete $packages->{mediums}{$medium_name}; unlink $newf; $o_fhdlist or unlink $newsf; die "fatal: no hdlist nor synthesis to read for $fakemedium"; } - $m->{start} > $m->{end} and do { delete $packages->{mediums}{$medium}; + $m->{start} > $m->{end} and do { delete $packages->{mediums}{$medium_name}; unlink $newf; $o_fhdlist or unlink $newsf; die "fatal: nothing read in hdlist or synthesis for $fakemedium" }; -- cgit v1.2.1