summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-23 19:50:27 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-23 19:50:27 +0000
commit65336fd96b709bb71b3c04c46fbf4cfc90a795fd (patch)
tree9d16f519cb2bce2e72cdd3a912a064bd848fd92a /perl-install/install
parent6ad710cf3b3b6b719ab0625bac318898e1759590 (diff)
downloaddrakx-65336fd96b709bb71b3c04c46fbf4cfc90a795fd.tar
drakx-65336fd96b709bb71b3c04c46fbf4cfc90a795fd.tar.gz
drakx-65336fd96b709bb71b3c04c46fbf4cfc90a795fd.tar.bz2
drakx-65336fd96b709bb71b3c04c46fbf4cfc90a795fd.tar.xz
drakx-65336fd96b709bb71b3c04c46fbf4cfc90a795fd.zip
(setPackages) only select kernel-$1-devel-latest if we actually match
(spot by perl_checker)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/any.pm4
1 files changed, 2 insertions, 2 deletions
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);
}