diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-28 09:32:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-28 09:32:36 +0000 |
| commit | 113669c5e2093fd35676847f1a7b6224f579db08 (patch) | |
| tree | 88aa93b3cb0bc425ab269ec6668a41d0a8d46bb6 | |
| parent | 870541e8fa141d07a33396c2c92aedf0623a492e (diff) | |
| download | perl-URPM-113669c5e2093fd35676847f1a7b6224f579db08.tar perl-URPM-113669c5e2093fd35676847f1a7b6224f579db08.tar.gz perl-URPM-113669c5e2093fd35676847f1a7b6224f579db08.tar.bz2 perl-URPM-113669c5e2093fd35676847f1a7b6224f579db08.tar.xz perl-URPM-113669c5e2093fd35676847f1a7b6224f579db08.zip | |
move things (prepare for next commit)
| -rw-r--r-- | URPM/Resolve.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index c953c02..ebe27d2 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1639,11 +1639,11 @@ sub _sort_by_dependencies__add_obsolete_edges { my ($urpm, $state, $l, $requires) = @_; my @obsoletes = grep { $_->{obsoleted} } values %{$state->{rejected}} or return; + my @groups = grep { @$_ > 1 } map { [ keys %{$_->{closure}} ] } @obsoletes; my %fullnames = map { scalar($urpm->{depslist}[$_]->fullname) => $_ } @$l; - foreach my $rej (@obsoletes) { - my @group = map { $fullnames{$_} } keys %{$rej->{closure}}; - @group > 1 or next; + foreach my $group (@groups) { + my @group = map { $fullnames{$_} } @$group; foreach (@group) { @{$requires->{$_}} = uniq(@{$requires->{$_}}, @group); } |