From 468fd2241e38177ee0ecd7ada279c5b3613c3b70 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 13 Aug 2008 08:05:29 +0000 Subject: (packageCallbackChoices_) 'strict' pragma nicely show that a bug was introduced in r231074 (pixel, 2007-10-15) which was: "- in case of ftp/http media, we select basesystem before doing bestKernelPackage so we must ensure the choice callback selects the good kernel (reported by Thomas Spuhler on cooker mailing list)" --- perl-install/install/pkgs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index b7c3662f4..4aa817999 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -195,7 +195,7 @@ sub packageCallbackChoices_ { if (@$prefer) { @$prefer; } elsif ($virtual_pkg_name eq 'kernel') { - my $re = join('|', map { "kernel\Q$_-2" } bestKernel_extensions($o_match_all_hardware)); + my $re = join('|', map { "kernel\Q$_-2" } bestKernel_extensions()); my @l = grep { $_->name =~ $re } @$choices; log::l("packageCallbackChoices: kernel chosen ", join(",", map { $_->name } @l), " in ", join(",", map { $_->name } @$choices)); @l; -- cgit v1.2.1