aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-01-09 13:00:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-01-09 13:00:09 +0000
commite63b4ac204364e82c1ead9634a2ced6fbad3e81c (patch)
treeb593d71bf5e694f2eb0421b5905a5d312d515393 /URPM
parent5b96f0ab5511ced65703dbac536aea8b68f53a30 (diff)
downloadperl-URPM-e63b4ac204364e82c1ead9634a2ced6fbad3e81c.tar
perl-URPM-e63b4ac204364e82c1ead9634a2ced6fbad3e81c.tar.gz
perl-URPM-e63b4ac204364e82c1ead9634a2ced6fbad3e81c.tar.bz2
perl-URPM-e63b4ac204364e82c1ead9634a2ced6fbad3e81c.tar.xz
perl-URPM-e63b4ac204364e82c1ead9634a2ced6fbad3e81c.zip
fix previous commit
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index f68773c..1129f74 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -509,12 +509,12 @@ sub resolve_requested {
#- packages. If multiple packages are possible, simply ask the user which
#- one to choose; else take the first one available.
if (!@chosen) {
- $urpm->{debug_URPM}("no packages match " . _id_to_name($dep->{required})) if $urpm->{debug_URPM};
+ $urpm->{debug_URPM}("no packages match " . _id_to_name($urpm, $dep->{required})) if $urpm->{debug_URPM};
unshift @properties, $urpm->backtrack_selected($db, $state, $dep, %options);
next; #- backtrack code choose to continue with same package or completely new strategy.
} elsif ($options{callback_choices} && @chosen > 1) {
my @l = grep { ref $_ } $options{callback_choices}->($urpm, $db, $state, \@chosen);
- $urpm->{debug_URPM}("replacing " . _id_to_name($dep->{required}) . " with " .
+ $urpm->{debug_URPM}("replacing " . _id_to_name($urpm, $dep->{required}) . " with " .
join(' ', map { $_->name } @l)) if $urpm->{debug_URPM};
unshift @properties, map {
+{
@@ -529,8 +529,8 @@ sub resolve_requested {
#- now do the real work, select the package.
my $pkg = shift @chosen;
- if ($urpm->{debug_URPM} && $pkg->name ne _id_to_name($dep->{required})) {
- $urpm->{debug_URPM}("chosen " . $pkg->fullname . " for " . _id_to_name($dep->{required}));
+ if ($urpm->{debug_URPM} && $pkg->name ne _id_to_name($urpm, $dep->{required})) {
+ $urpm->{debug_URPM}("chosen " . $pkg->fullname . " for " . _id_to_name($urpm, $dep->{required}));
@chosen and $urpm->{debug_URPM}(" (it could also have chosen " . join(' ', map { scalar $_->fullname } @chosen));
}