Ticket #13: yum-3.2.21-consider-ts.patch

yum/__init__.py

@@ -2585 +2585 @@
-                    self.tsInfo.addObsoleted(obsoletee, po)
-                    tx_return.append(txmbr)
-            else:
+                # naive handling of packages that are already in the transaction set
+                if not self.allowedMultipleInstalls(po):
+                    for tsmember in self.tsInfo.matchNaevr(name = po.name):
+                        self.tsInfo.remove(tsmember.pkgtup)
+
-                txmbr = self.tsInfo.addInstall(po)
-                tx_return.append(txmbr)
-        
@@ -2855 +2860 @@
-        
-        tx_return = []
-        pkgs = []
-
+tspkgs = []
-        
-        if po:
-            pkgs = [po]  
+            tspkgs = self.tsInfo.getMembers(po.pkgtup)
-        else:
-            if kwargs.has_key('pattern'):
-                if kwargs['pattern'][0] == '@':
@@ -2879 +2885 @@
-                        self.logger.critical(_('No Match for argument: %s') % arg)
-                    else:
-                        pkgs.extend(depmatches)
-
+
+
+
+
-            else:    
-                nevra_dict = self._nevra_kwarg_parse(kwargs)
-
@@ -2891 +2900 @@
-                    if not kwargs.get('silence_warnings', False):
-                        self.logger.warning(_("No package matched to remove"))
-
+                tspkgs = self.tsInfo.matchNaevr(name=nevra_dict['name'],
+                           arch=nevra_dict['arch'], epoch=nevra_dict['epoch'],
+                           ver=nevra_dict['version'], rel=nevra_dict['release'])
+
+        # naive handling of packages that are already in the transaction set
+        for txmbr in tspkgs:
+            self.tsInfo.remove(txmbr.pkgtup)
+
-        for po in pkgs:
-            txmbr = self.tsInfo.addErase(po)
-            tx_return.append(txmbr)