From 6eea01b8b858544ccb23eae53af78c53412c387c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 19 Mar 2012 18:56:36 +0000
Subject: (is_i586) simplify ; on less I/O on non x86 machines

---
 perl-install/detect_devices.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8cc4935d3..d0f92694a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1157,10 +1157,8 @@ sub BIGMEM() {
 }
 
 sub is_i586() {
+    return 0 if arch() !~ /86/;
     my $cpuinfo = cat_('/proc/cpuinfo');
-    if (arch() !~ /86/) {
-        return 0;
-    }
     $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 ||
       $cpuinfo =~ /^model name\s*:\s*Transmeta.* TM5800/m || # mdvbz#37866
       !has_cpu_flag('cmov');
-- 
cgit v1.2.1