diff options
| -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 883b9bf..820eb3c 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -122,6 +122,7 @@ sub resolve_requested { #- of being chosen) by default and ask user. foreach my $p (values %$packages) { $p or next; #- this could happen if no package are suitable for this arch. + exists $state->{obsoleted}{$p->fullname} and next; #- avoid taking what is removed (incomplete). exists $state->{selected}{$p->id} and $pkg = $p, last; #- already selected package is taken. if (exists $requested{$p->id}) { push @chosen_requested, $p; diff --git a/perl-URPM.spec b/perl-URPM.spec index f853635..7905db0 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.05 -%define release 1mdk +%define release 2mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 1 2002 François Pons <fpons@mandrakesoft.com> 0.05-2mdk +- fixed selection of obsoleted package already installed but + present in depslist. + * Fri Jun 28 2002 François Pons <fpons@mandrakesoft.com> 0.05-1mdk - fixed ask_remove not to contains arch. - removed relocate_depslist (obsoleted). |