Change in vdsm[master]: bz#849886 allow multilib in bootstrap when download package

Royce Lv has uploaded a new change for review.

Change subject: bz#849886 allow multilib in bootstrap when download package
......................................................................

bz#849886 allow multilib in bootstrap when download package

Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1
Signed-off-by: Royce Lv
---
M vds_bootstrap/vds_bootstrap.py
M vdsm_reg/deployUtil.py.in
2 files changed, 6 insertions(+), 5 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/7383/1

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 8211c81..59230f2 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -443,9 +443,10 @@

def _installPackage(self, pack, type, update=0):
         nReturn = 0
+        option = "--setopt=protected_multilib=false"
         logging.debug('Installing %s %d',pack, update )
         if type == "REQ" or type == "DEVEL":
-            self.res, self.message = deployUtil.installAndVerify(type, pack, "install")
+            self.res, self.message = deployUtil.installAndVerify(type, pack, "install", option)
             res = "OK"
             if not self.res:
                 res = "FAIL"
@@ -456,7 +457,7 @@
             if update == 1:
                 yumcmd = "update"

-            self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd)
+            self.res, self.message = deployUtil.installAndVerify(type, pack, yumcmd, option)
             res = "OK"
             if not self.res:
                 res = "FAIL"
@@ -468,7 +469,7 @@
                 yumcmd = "update"

self.res, self.message = deployUtil.installAndVerify(type, pack,
-                                                                 yumcmd)
+                                                                 yumcmd, option)
             res = "OK"
             if not self.res:
                 res = "FAIL"
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index e22bfb5..af37547 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -1015,7 +1015,7 @@
     """
     execFunc = [EX_YUM, "-y"]
     if args is not None:
-        execFunc += args
+        execFunc.append(args)

if action == "install":
         execFunc.append(action)
@@ -1033,7 +1033,7 @@
         a package, and then verify it.
     """
     fReturn = True
-    out, err, ret = yumInstallDeleteUpdate(pckgName, action, args=None)
+    out, err, ret = yumInstallDeleteUpdate(pckgName, action, args)
     msg = None
     if not ret:
         fReturn, msg = getPackageInfo(pckgType, pckgName, 'install')

--
To view, visit http://gerrit.ovirt.org/7383
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0574afc94c038f7b53b890bae875cf66d9b58f1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Royce Lv