[yum-commits] Branch 'yum-3_2_X' - yum/__init__.py

[Tim Lauridsen]

 yum/__init__.py |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

New commits:
commit be48d970a0418c84e68a98d703b0cd47e01e36ff
Author: Tim Lauridsen <tim at naboo.local>
Date:   Fri Mar 6 15:03:29 2009 +0100

    Make skipbroken remove other available arch packages from pkgSack, when a package is removed from the transaction on singlelib system (rhbz #488224)

diff --git a/yum/__init__.py b/yum/__init__.py
index d74d2f1..e624920 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -847,20 +847,16 @@ class YumBase(depsolve.Depsolve):
 
     def _skipFromTransaction(self,po):
         skipped =  []
-        if rpmUtils.arch.isMultiLibArch():
-            archs = rpmUtils.arch.getArchList() 
-            n,a,e,v,r = po.pkgtup
-            # skip for all compat archs
-            for a in archs:
-                pkgtup = (n,a,e,v,r)
-                if self.tsInfo.exists(pkgtup):
-                    for txmbr in self.tsInfo.getMembers(pkgtup):
-                        pkg = txmbr.po
-                        skip = self._removePoFromTransaction(pkg)
-                        skipped.extend(skip)
-        else:
-            msgs = self._removePoFromTransaction(po)
-            skipped.extend(msgs)
+        archs = rpmUtils.arch.getArchList() 
+        n,a,e,v,r = po.pkgtup
+        # skip for all compat archs
+        for a in archs:
+            pkgtup = (n,a,e,v,r)
+            if self.tsInfo.exists(pkgtup):
+                for txmbr in self.tsInfo.getMembers(pkgtup):
+                    pkg = txmbr.po
+                    skip = self._removePoFromTransaction(pkg)
+                    skipped.extend(skip)
         return skipped
 
     def _removePoFromTransaction(self,po):