From 849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 1 Oct 2007 16:06:40 +0000 Subject: move _find_required_package__kernel_source() out of _find_required_package__sort() (since it's not really a sort) --- URPM/Resolve.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'URPM') diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index a80e7f3..357f5b5 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -171,6 +171,11 @@ sub find_required_package { _set_flag_installed_and_upgrade_if_no_newer($db, $pkg); } + if (my @kernel_source = _find_required_package__kernel_source($urpm, $db, \@chosen)) { + $urpm->{debug_URPM}("packageCallbackChoices: kernel source chosen " . join(",", map { $_->name } @kernel_source) . " in " . join(",", map { $_->name } @chosen)) if $urpm->{debug_URPM}; + return \@kernel_source, \@kernel_source; + } + _find_required_package__sort($urpm, $db, \@packages); } else { \@packages; @@ -203,11 +208,6 @@ sub _find_required_package__sort { return [ $chosen[0] ]; } - if (my @kernel_source = _find_required_package__kernel_source($urpm, $db, \@chosen)) { - $urpm->{debug_URPM}("packageCallbackChoices: kernel source chosen " . join(",", map { $_->name } @kernel_source) . " in " . join(",", map { $_->name } @chosen)) if $urpm->{debug_URPM}; - return \@kernel_source, \@kernel_source; - } - if ($urpm->{media}) { @chosen_with_score = sort { $a->[2] != $b->[2] ? -- cgit v1.2.1