From be05e4a5a7a08df909b2713faa0d7c72b487fd9c Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 2 Jul 2001 17:08:09 +0000 Subject: *** empty log message *** --- urpm.pm | 4 ++-- urpmi.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/urpm.pm b/urpm.pm index 2b6b16e2..490dd05a 100644 --- a/urpm.pm +++ b/urpm.pm @@ -918,7 +918,7 @@ sub register_local_packages { $urpm->{fatal}(7, _("rpmtools package is too old, please upgrade it")); } } - $error and die "error registering local packages"; + $error and $urpm->{fatal}(1, _("error registering local packages")); #- compute depslist associated. $urpm->{params}->compute_depslist; @@ -1020,7 +1020,7 @@ sub search_packages { $best->{info}{release}); if ($_->{info}{serial} > $best->{info}{serial} || $cmp_version > 0 || $cmp_release > 0 || ($_->{info}{serial} == $best->{info}{serial} && $cmp_version == 0 && $cmp_release == 0 && - better_arch($_->{info}{arch}, $best->{info}{arch}))) { + rpmtools::better_arch($_->{info}{arch}, $best->{info}{arch}))) { $best = $_; } } else { diff --git a/urpmi.spec b/urpmi.spec index 0e3f36de..f9379fb3 100644 --- a/urpmi.spec +++ b/urpmi.spec @@ -2,7 +2,7 @@ Name: urpmi Version: 1.6 -Release: 8mdk +Release: 9mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -106,6 +106,10 @@ rm -f /var/lib/urpmi/depslist %changelog +* Mon Jul 2 2001 François Pons 1.6-9mdk +- fixed missing rpmtools reference in urpm library. +- changed die in fatal error. + * Mon Jul 2 2001 François Pons 1.6-8mdk - fixed typo by pixel. - fixed bad reference in urpm reported by Michael Reinsch. -- cgit v1.2.1