diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-09-17 13:16:47 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-09-17 13:16:47 +0000 |
| commit | 3b66cccbb743adac20e4512264a47f36eeec1f1a (patch) | |
| tree | b2d0d1f6400f8170cc7e62268641c056834aed85 | |
| parent | c37b689a885ea3a2620f5beac3056b012f4d4423 (diff) | |
| download | perl-URPM-3b66cccbb743adac20e4512264a47f36eeec1f1a.tar perl-URPM-3b66cccbb743adac20e4512264a47f36eeec1f1a.tar.gz perl-URPM-3b66cccbb743adac20e4512264a47f36eeec1f1a.tar.bz2 perl-URPM-3b66cccbb743adac20e4512264a47f36eeec1f1a.tar.xz perl-URPM-3b66cccbb743adac20e4512264a47f36eeec1f1a.zip | |
0.70-10mdkvpost_9_0_stable
| -rw-r--r-- | URPM/Resolve.pm | 1 | ||||
| -rw-r--r-- | perl-URPM.spec | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 61b04f3..fd479fa 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -723,6 +723,7 @@ sub request_packages_to_upgrade { my @names = map { $_->name." == ".$_->epoch.":".$_->version."-".$_->release } values %names; my @pkgs = values %names; foreach my $pkg (@pkgs) { + exists $requested{$pkg->name} or next; foreach my $conflict ($pkg->conflicts) { delete @names{map { /(\S*)/ && $1 } grep { ranges_overlap($conflict, $_) } @names}; } diff --git a/perl-URPM.spec b/perl-URPM.spec index b2b3fac..5258b69 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.70 -%define release 9mdk +%define release 10mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 17 2002 François Pons <fpons@mandrakesoft.com> 0.70-10mdk +- fixed some packages which may not be upgraded on call to + request_packages_to_upgrade according to packages in depslist. + * Mon Sep 9 2002 François Pons <fpons@mandrakesoft.com> 0.70-9mdk - select package already installed to be taken instead of proposing choice to the user. |