Attachment 157909 Details for Bug 245707 – corrects the check installed pkgs for conflicts-with ts members

[patch] corrects the check installed pkgs for conflicts-with ts members

yum-conflict-check.patch (text/plain), 1.43 KB, created by Seth Vidal on 2007-06-26 15:36:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Seth Vidal

Created: 2007-06-26 15:36:07 UTC

Size: 1.43 KB

patch

obsolete

>? yum-3.2.1.tar.gz
>Index: yum/depsolve.py
>===================================================================
>RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
>retrieving revision 1.170
>diff -u -r1.170 depsolve.py
>--- yum/depsolve.py	19 Jun 2007 21:54:53 -0000	1.170
>+++ yum/depsolve.py	26 Jun 2007 15:32:12 -0000
>@@ -997,7 +997,18 @@
>                         ret.append( ((txmbr.name, txmbr.version, txmbr.release),
>                                      (r, version_tuple_to_string(v)), flags[f],
>                                      None, rpm.RPMDEP_SENSE_CONFLICTS) )
>-                    
>+        
>+        for instpkg in self.rpmdb.searchConflicts(txmbr.name):
>+            prcotuple = (txmbr.name, 'EQ', (txmbr.epoch, txmbr.version, txmbr.release))
>+            if instpkg.checkPrco('conflicts', prcotuple):
>+                # if the conflict-having-version is being removed then well, it doesn't matter
>+                if self.tsInfo.getMembersWithState(instpkg.pkgtup, output_states=TS_REMOVE_STATES):
>+                    continue
>+                instevr = (instpkg.epoch, instpkg.ver, instpkg.rel)
>+                ret.append( ((txmbr.name, txmbr.version, txmbr.release),
>+                             (instpkg.name, version_tuple_to_string(instevr)), rpm.RPMSENSE_EQUAL,
>+                                     None, rpm.RPMDEP_SENSE_CONFLICTS) )
>+                
>         return ret
> 
>     def _checkRemove(self, txmbr):
>? rpmUtils/updates.py.crack

Actions: View | Diff

Attachments on bug 245707: 157909 | 158143