diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-03 05:24:46 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-03 05:24:46 +0000 |
| commit | 794df84e122f73d381f8873a59d9315d9c682d52 (patch) | |
| tree | 6dcbacf77bd9fb4dfd2c43befc2f45afbe63b8e8 /perl-install | |
| parent | 4c252586efdc96e8170304e326c133617d2fea39 (diff) | |
| download | drakx-794df84e122f73d381f8873a59d9315d9c682d52.tar drakx-794df84e122f73d381f8873a59d9315d9c682d52.tar.gz drakx-794df84e122f73d381f8873a59d9315d9c682d52.tar.bz2 drakx-794df84e122f73d381f8873a59d9315d9c682d52.tar.xz drakx-794df84e122f73d381f8873a59d9315d9c682d52.zip | |
Remove support for looking directly for a hdlist1s.cz file on supplementary CDs.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_any.pm | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 112480514..46102ef8d 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -438,30 +438,7 @@ sub selectSupplMedia { useMedium($medium_name); #- probe for an hdlists file and then look for all hdlists listed herein eval { pkgs::psUsingHdlists($o, $suppl_method, "/mnt/cdrom/media/media_info/hdlists", $o->{packages}, '1s') }; - if ($@) { - log::l("psUsingHdlists failed: $@"); - #- no hdlists found on the suppl. CD - #- Look directly for a file media/main/hdlist1s.cz - my $supplmedium = pkgs::psUsingHdlist( - $o->{prefix}, # /mnt - $suppl_method, - $o->{packages}, - "hdlist$medium_name.cz", - $medium_name, - 'media/main', - "Supplementary CD $medium_name", - 1, # selected - "/mnt/cdrom/media/main/media_info/hdlist$medium_name.cz", - ); - if ($supplmedium) { - log::l("read suppl hdlist on cdrom"); - $supplmedium->{prefix} = "removable://mnt/cdrom"; #- for install_urpmi - $supplmedium->{selected} = 1; - $supplmedium->{method} = 'cdrom'; - } else { - log::l("no suppl hdlist"); - } - } + log::l("psUsingHdlists failed: $@"); } } else { my $url = $o->ask_from_entry('', N("URL of the mirror?")) or return ''; |