diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-10-01 16:06:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-10-01 16:06:40 +0000 |
| commit | 849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc (patch) | |
| tree | 93ae3c5e4c04fd422d03400c3550842650a53f43 /URPM/Resolve.pm | |
| parent | 0f418a63bc8ef45a17f5125497805330ea262a73 (diff) | |
| download | perl-URPM-849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc.tar perl-URPM-849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc.tar.gz perl-URPM-849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc.tar.bz2 perl-URPM-849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc.tar.xz perl-URPM-849fad1cd3ed505b07cb20cf19bbf3f99e6c89bc.zip | |
move _find_required_package__kernel_source() out of
_find_required_package__sort() (since it's not really a sort)
Diffstat (limited to 'URPM/Resolve.pm')
| -rw-r--r-- | URPM/Resolve.pm | 10 |
1 files changed, 5 insertions, 5 deletions
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] ? |