diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-09-19 09:46:13 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-09-19 09:46:13 +0000 |
| commit | 8a3601d1eb4d6a747dce5cee462c2f1353f4e439 (patch) | |
| tree | 75ff47f7eac774f1952fc977b9fa61a35e7cf21e | |
| parent | 977b3927fd70306763207cf442c5de804ac2161a (diff) | |
| download | drakx-8a3601d1eb4d6a747dce5cee462c2f1353f4e439.tar drakx-8a3601d1eb4d6a747dce5cee462c2f1353f4e439.tar.gz drakx-8a3601d1eb4d6a747dce5cee462c2f1353f4e439.tar.bz2 drakx-8a3601d1eb4d6a747dce5cee462c2f1353f4e439.tar.xz drakx-8a3601d1eb4d6a747dce5cee462c2f1353f4e439.zip | |
do not use $::o in install::pkgs (to be consistent with next commit and to please pixel)
| -rw-r--r-- | perl-install/install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 15e58d428..0d27d2e36 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -397,7 +397,7 @@ sub setPackages { #- always try to select basic kernel (else on upgrade, kernel will never be updated provided a kernel is already #- installed and provides what is necessary). - my $kernel_pkg = install::pkgs::bestKernelPackage($o->{packages}); + 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)"); diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index f84a2a2b4..c67843912 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -129,10 +129,10 @@ sub packageByName { } sub bestKernelPackage { - my ($packages) = @_; + my ($packages, $o_match_all_hardware) = @_; my @preferred_exts = - $::o->{match_all_hardware} ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') : + $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') : detect_devices::is_xbox() ? '-xbox' : detect_devices::is_i586() ? '-desktop586' : detect_devices::isLaptop() ? '-laptop' : |