diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-30 10:36:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-30 10:36:36 +0000 |
| commit | 2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf (patch) | |
| tree | 9b017c5aae179495c8baa2054181c4d84ec13776 | |
| parent | f4ff83243a45e90593dbb42953857ebfca424a53 (diff) | |
| download | drakx-2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf.tar drakx-2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf.tar.gz drakx-2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf.tar.bz2 drakx-2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf.tar.xz drakx-2c490727a61e4922ef6c5bdf20e0ef9f2bc8edcf.zip | |
(get_medium) do not download hdlists anymore
| -rw-r--r-- | perl-install/install/media.pm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index e9151fa24..3af866cb1 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -29,7 +29,6 @@ use urpm::download; #- end (last rpm id, undefined iff not selected) #- fakemedium ("$name ($rpmsdir)", used locally by urpmi) #- rel_hdlist -#- hdlist_size #- key_ids (hashref, values are key ids) #- name (text description) #- pubkey (array containing all the keys to import) @@ -698,21 +697,11 @@ sub get_medium { log::l("trying to read $m->{rel_hdlist} for medium '$m->{fakemedium}'"); - #- copy hdlist file directly to urpmi directory, this will be used - #- for getting header of package during installation. - my $hdlist = hdlist_on_disk($m); - { - getAndSaveFile_progress($in_wait, N("Downloading file %s...", $m->{rel_hdlist}), - $phys_m, $m->{rel_hdlist}, $hdlist) or die "no $m->{rel_hdlist} found"; - - $m->{hdlist_size} = -s $hdlist; #- keep track of size for post-check. - } - + #- copy synthesis file directly to urpmi directory. my $synthesis = urpmidir() . "/synthesis.hdlist.$m->{fakemedium}.cz"; { my $rel_synthesis = $m->{rel_hdlist}; $rel_synthesis =~ s!/hdlist!/synthesis.hdlist! or internal_error("bad {rel_hdlist} $m->{rel_hdlist}"); - #- copy existing synthesis file too. getAndSaveFile_progress($in_wait, N("Downloading file %s...", $rel_synthesis), $phys_m, $rel_synthesis, $synthesis); $m->{synthesis_hdlist_size} = -s $synthesis; #- keep track of size for post-check. |