summaryrefslogtreecommitdiffstats
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
commit6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a (patch)
tree9d16f519cb2bce2e72cdd3a912a064bd848fd92a
parent6e0106254719ab097b11839a80183d8e80e9cd1c (diff)
downloaddrakx-backup-do-not-use-6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a.tar
drakx-backup-do-not-use-6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a.tar.gz
drakx-backup-do-not-use-6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a.tar.bz2
drakx-backup-do-not-use-6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a.tar.xz
drakx-backup-do-not-use-6aec5b9dcef9762dcb1a4554921fea6b8ffa9f6a.zip
(setPackages) only select kernel-$1-devel-latest if we actually match
(spot by perl_checker)
-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);
}