From 6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 30 Mar 2010 13:26:54 +0000
Subject: do not try to use setarch on ARM

---
 lib/MDV/Draklive/Utils.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/MDV/Draklive/Utils.pm b/lib/MDV/Draklive/Utils.pm
index eba97c7..f98074a 100644
--- a/lib/MDV/Draklive/Utils.pm
+++ b/lib/MDV/Draklive/Utils.pm
@@ -27,8 +27,10 @@ sub run_ {
     my $options = ref $_[0] eq 'HASH' ? shift @_ : {};
     my @cmd = @_;
     $options->{timeout} ||= 'never';
-    my $targetarch = delete $options->{targetarch};
-    unshift @cmd, 'setarch', $targetarch if $targetarch;
+    if (arch() !~ /^arm/) {
+        my $targetarch = delete $options->{targetarch};
+        unshift @cmd, 'setarch', $targetarch if $targetarch;
+    }
     print STDERR "running " . (exists $options->{root} && "(in chroot) ") . join(' ', @cmd) . "\n";
     run_program::raw($options, @cmd);
 }
-- 
cgit v1.2.1