From 65336fd96b709bb71b3c04c46fbf4cfc90a795fd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 23 Mar 2012 19:50:27 +0000 Subject: (setPackages) only select kernel-$1-devel-latest if we actually match (spot by perl_checker) --- perl-install/install/any.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index ed5c8b497..d1e4fc847 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -344,8 +344,8 @@ sub setPackages { #- installed and provides what is necessary). my $kernel_pkg = install::pkgs::bestKernelPackage($o->{packages}, $o->{match_all_hardware}); install::pkgs::selectPackage($o->{packages}, $kernel_pkg, 1); - if ($o->{isUpgrade} && $o->{packages}{sizes}{dkms}) { - my $devel_kernel_pkg = "$1-devel-latest" if $kernel_pkg =~ /(.*)-latest/; + if ($o->{isUpgrade} && $o->{packages}{sizes}{dkms} && $kernel_pkg =~ /(.*)-latest/) { + my $devel_kernel_pkg = "$1-devel-latest"; log::l("selecting $devel_kernel_pkg (since dkms was installed)"); install::pkgs::select_by_package_names($o->{packages}, [ $devel_kernel_pkg ], 1); } -- cgit v1.2.1