diff options
| -rw-r--r-- | urpm.pm | 10 | ||||
| -rw-r--r-- | urpmi.spec | 10 |
2 files changed, 16 insertions, 4 deletions
@@ -644,7 +644,6 @@ sub add_distrib_media { unlink "$urpm->{cachedir}/partial/hdlists"; eval { $urpm->{log}(_("retrieving hdlists file...")); -# $urpm->{sync}({proxy => $urpm->{proxy}}, "$urpm->{cachedir}/partial", reduce_pathname("$url/Mandrake/base/hdlists")); $urpm->{sync}({dir => "$urpm->{cachedir}/partial", quiet => 0, proxy => $urpm->{proxy}}, reduce_pathname("$url/Mandrake/base/hdlists")); $urpm->{log}(_("...retrieving done")); }; @@ -1065,18 +1064,22 @@ sub update_media { #- anyway, if one tries fails, try another mode. my @unresolved_before = grep { ! defined $urpm->{provides}{$_} } keys %{$urpm->{provides} || {}}; if (!$medium->{synthesis} || -s "$urpm->{cachedir}/partial/$medium->{hdlist}" > 262144) { + $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{cachedir}/partial/$medium->{hdlist}")); ($medium->{start}, $medium->{end}) = $urpm->parse_hdlist("$urpm->{cachedir}/partial/$medium->{hdlist}", 1); if (defined $medium->{start} && defined $medium->{end}) { delete $medium->{synthesis}; } else { + $urpm->{log}(_("examining synthesis file [%s]", "$urpm->{cachedir}/partial/$medium->{hdlist}")); ($medium->{start}, $medium->{end}) = $urpm->parse_synthesis("$urpm->{cachedir}/partial/$medium->{hdlist}"); defined $medium->{start} && defined $medium->{end} and $medium->{synthesis} = 1; } } else { + $urpm->{log}(_("examining synthesis file [%s]", "$urpm->{cachedir}/partial/$medium->{hdlist}")); ($medium->{start}, $medium->{end}) = $urpm->parse_synthesis("$urpm->{cachedir}/partial/$medium->{hdlist}"); if (defined $medium->{start} && defined $medium->{end}) { $medium->{synthesis} = 1; } else { + $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{cachedir}/partial/$medium->{hdlist}")); ($medium->{start}, $medium->{end}) = $urpm->parse_hdlist("$urpm->{cachedir}/partial/$medium->{hdlist}", 1); defined $medium->{start} && defined $medium->{end} and delete $medium->{synthesis}; } @@ -1165,7 +1168,10 @@ sub update_media { #- some unresolved provides may force to rebuild all synthesis, #- a second pass will be necessary. - $urpm->{second_pass} and $urpm->unresolved_provides_clean; + if ($urpm->{second_pass}) { + $urpm->{log}(_("performing second pass to compute dependencies\n")); + $urpm->unresolved_provides_clean; + } #- second pass consist of reading again synthesis or hdlist. foreach my $medium (@{$urpm->{media}}) { @@ -2,13 +2,13 @@ Name: urpmi Version: 3.9 -Release: 2mdk +Release: 3mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate Summary: User mode rpm install Requires: eject webfetch perl-DateManip >= 5.40 -PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.50-2mdk +PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.50-4mdk BuildRequires: bzip2-devel gcc-c++ gettext rpm-devel >= 4.0.3 BuildRoot: %{_tmppath}/%{name}-buildroot BuildArch: noarch @@ -144,6 +144,12 @@ fi %changelog +* Wed Jul 24 2002 François Pons <fpons@mandrakesoft.com> 3.9-3mdk +- added more log. +- use perl-URPM-0.50-4mdk or better for correct generation of + synthesis file for unresolved provides when packages are + multiply defined. + * Tue Jul 23 2002 François Pons <fpons@mandrakesoft.com> 3.9-2mdk - updated urpme to use perl-URPM and speed it up (no more rpm -e --test ...). |