diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-09-03 14:05:46 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-09-03 14:05:46 +0000 |
| commit | 161d81cfc6bf0ac30bdd7de5221c962b9123b1d7 (patch) | |
| tree | 880ddab5ccc10bce81cb2ff2b6066a2c1539b85d | |
| parent | c766a457896a32339ee6f0c2fbfeed867f279db7 (diff) | |
| download | drakx-161d81cfc6bf0ac30bdd7de5221c962b9123b1d7.tar drakx-161d81cfc6bf0ac30bdd7de5221c962b9123b1d7.tar.gz drakx-161d81cfc6bf0ac30bdd7de5221c962b9123b1d7.tar.bz2 drakx-161d81cfc6bf0ac30bdd7de5221c962b9123b1d7.tar.xz drakx-161d81cfc6bf0ac30bdd7de5221c962b9123b1d7.zip | |
(setPackages) install the right kernel-XXX-devel-latest flavor instead of
hardcoding 'kernel-desktop-devel-latest'
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a38d16302..4d87ad5c9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - allow minimal install without suggests (#45665) +- install the right kernel-XXX-devel-latest flavor instead of + hardcoding 'kernel-desktop-devel-latest' Version 12.47 - 1 September 2009 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index c92bc35c8..ea31266ba 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -344,8 +344,9 @@ sub setPackages { 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}) { - log::l("selecting kernel-desktop-devel-latest (since dkms was installed)"); - install::pkgs::select_by_package_names($o->{packages}, ['kernel-desktop-devel-latest'], 1); + my $devel_kernel_pkg = "$1-devel-latest" if $kernel_pkg =~ /(.*)-latest/; + log::l("selecting $devel_kernel_pkg (since dkms was installed)"); + install::pkgs::select_by_package_names($o->{packages}, [ $devel_kernel_pkg], 1); } install::pkgs::select_by_package_names_or_die($o->{packages}, ['basesystem'], 1); |