From 8a3601d1eb4d6a747dce5cee462c2f1353f4e439 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 19 Sep 2007 09:46:13 +0000
Subject: do not use $::o in install::pkgs (to be consistent with next commit
 and to please pixel)

---
 perl-install/install/any.pm  | 2 +-
 perl-install/install/pkgs.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

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' :
-- 
cgit v1.2.1