diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-06-11 11:34:05 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-06-11 11:34:05 +0000 |
| commit | 262f4e757d4548bd54a14764c642dc3f906a2744 (patch) | |
| tree | 0435f6be976f29cfe445313ea5ed9195446945a4 | |
| parent | 707645ab7ba247529060589ecac31c948d333d5a (diff) | |
| download | perl-URPM-262f4e757d4548bd54a14764c642dc3f906a2744.tar perl-URPM-262f4e757d4548bd54a14764c642dc3f906a2744.tar.gz perl-URPM-262f4e757d4548bd54a14764c642dc3f906a2744.tar.bz2 perl-URPM-262f4e757d4548bd54a14764c642dc3f906a2744.tar.xz perl-URPM-262f4e757d4548bd54a14764c642dc3f906a2744.zip | |
0.90-9mdk
| -rw-r--r-- | URPM/Resolve.pm | 12 | ||||
| -rw-r--r-- | perl-URPM.spec | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 27a881d..948e801 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -158,8 +158,8 @@ sub unsatisfied_requires { #- check on selected package if a provide is satisfying the resolution (need to do the ops). foreach (keys %{$urpm->{provides}{$n} || {}}) { - exists $state->{selected}{$_} or next; my $p = $urpm->{depslist}[$_]; + $p->flag_selected || exists $state->{selected}{$_} or next; if ($urpm->{provides}{$n}{$_}) { #- sense information are used, this means we have to examine carrefully the provides. foreach ($p->provides) { @@ -623,6 +623,11 @@ sub disable_selected { } } + #- the package being examined has to be unselected. + $pkg->set_flag_requested(0); + $pkg->set_flag_required(0); + delete $state->{selected}{$pkg->id}; + #- determine package that requires properties no more available, so that they need to be #- unselected too. foreach my $n ($pkg->provides_nosense) { @@ -636,11 +641,6 @@ sub disable_selected { } } - #- the package being examined has to be unselected. - $pkg->set_flag_requested(0); - $pkg->set_flag_required(0); - delete $state->{selected}{$pkg->id}; - #- clean whatrequires hash. foreach ($pkg->requires_nosense) { delete $state->{whatrequires}{$_}{$pkg->id}; diff --git a/perl-URPM.spec b/perl-URPM.spec index bdfa0d8..fe06d91 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.90 -%define release 8mdk +%define release 9mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 11 2003 François Pons <fpons@mandrakesoft.com> 0.90-9mdk +- fixed problem in disable_selected (ordering of operations). + * Thu Jun 5 2003 François Pons <fpons@mandrakesoft.com> 0.90-8mdk - cleaned code to be more perl portable. - fixed severe bug on perl stack manipulation when using callback. |