summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-13 08:05:29 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-13 08:05:29 +0000
commit468fd2241e38177ee0ecd7ada279c5b3613c3b70 (patch)
treea07eeeb3141ad1fdeada6fb9119ac8d5b14ecb64
parent688928ca6349f3e5e164f2b36c2255dc3bb237e3 (diff)
downloaddrakx-468fd2241e38177ee0ecd7ada279c5b3613c3b70.tar
drakx-468fd2241e38177ee0ecd7ada279c5b3613c3b70.tar.gz
drakx-468fd2241e38177ee0ecd7ada279c5b3613c3b70.tar.bz2
drakx-468fd2241e38177ee0ecd7ada279c5b3613c3b70.tar.xz
drakx-468fd2241e38177ee0ecd7ada279c5b3613c3b70.zip
(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)"
-rw-r--r--perl-install/install/pkgs.pm2
1 files changed, 1 insertions, 1 deletions
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;