From 41be2f7ec5b41e978e833f87883b92e37d42e136 Mon Sep 17 00:00:00 2001
From: Michael E Brown <mebrown@michaels-house.net>
Date: Sat, 17 Nov 2007 18:58:53 -0600
Subject: make setarch configurable because suse doesnt have it.

---
 src/py-libs/backend.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/py-libs')

diff --git a/src/py-libs/backend.py b/src/py-libs/backend.py
index 971b030..492e8a0 100644
--- a/src/py-libs/backend.py
+++ b/src/py-libs/backend.py
@@ -32,7 +32,11 @@ class Root(object):
         self.uidManager = uidManager
         self._hooks = {}
         self.chrootWasCleaned = False
-        self.preExistingDeps = "/usr/bin/setarch "
+
+        self.preExistingDeps = ""
+        self.setarch = config['setarch']
+        if config['internal_setarch']:
+            self.preExistingDeps = "/usr/bin/setarch "
 
         self.sharedRootName = config['root']
         root = self.sharedRootName
@@ -372,7 +376,7 @@ class Root(object):
             self._callHooks('prebuild')
 
             mock.util.do(
-                "setarch %s rpmbuild -bb --target %s --nodeps %s" % (self.target_arch, self.target_arch, chrootspec), 
+                "%s rpmbuild -bb --target %s --nodeps %s" % (self.setarch, self.target_arch, chrootspec), 
                 chrootPath=self.rootdir,
                 uidManager=self.uidManager,
                 uid=self.chrootuid,
@@ -440,7 +444,7 @@ class Root(object):
     def _yum(self, cmd, returnOutput=0):
         """use yum to install packages/package groups into the chroot"""
         # mock-helper yum --installroot=rootdir cmd
-        cmd = 'setarch %s %s --installroot %s %s' % (self.target_arch, self.yum_path, self.rootdir, cmd)
+        cmd = '%s %s --installroot %s %s' % (self.setarch, self.yum_path, self.rootdir, cmd)
         self.root_log.info(cmd)
         try:
             self._callHooks("preyum")
-- 
cgit