summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-07-24 12:42:00 +0000
committerFrancois Pons <fpons@mandriva.com>2002-07-24 12:42:00 +0000
commit2e0bbc5c2cfaf20b541672f7c76621616cecca54 (patch)
treeae72050328ded90dc0742cf84f3377fa37ec9da3
parentf9dc4420c58ad0ea68b0644ee8fcdd6b37765bd9 (diff)
downloadurpmi-2e0bbc5c2cfaf20b541672f7c76621616cecca54.tar
urpmi-2e0bbc5c2cfaf20b541672f7c76621616cecca54.tar.gz
urpmi-2e0bbc5c2cfaf20b541672f7c76621616cecca54.tar.bz2
urpmi-2e0bbc5c2cfaf20b541672f7c76621616cecca54.tar.xz
urpmi-2e0bbc5c2cfaf20b541672f7c76621616cecca54.zip
3.9-3mdk
-rw-r--r--urpm.pm10
-rw-r--r--urpmi.spec10
2 files changed, 16 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index e7a79f9a..9180712b 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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}}) {
diff --git a/urpmi.spec b/urpmi.spec
index b732af5f..4e9ca0a5 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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 ...).