Attachment 125577 Details for Bug 176257 – patch

[patch] patch

yum-plugin-depcheck.patch (text/plain), 3.04 KB, created by Jeremy Katz on 2006-03-03 01:18:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Katz

Created: 2006-03-03 01:18:59 UTC

Size: 3.04 KB

patch

obsolete

>Index: yum/__init__.py
>===================================================================
>RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
>retrieving revision 1.191
>diff -u -u -w -r1.191 __init__.py
>--- yum/__init__.py	2 Mar 2006 21:34:38 -0000	1.191
>+++ yum/__init__.py	3 Mar 2006 01:10:39 -0000
>@@ -400,6 +400,10 @@
>         self.plugins.run('preresolve')
>         (rescode, restring) = self.resolveDeps()
>         self.plugins.run('postresolve', rescode=rescode, restring=restring)
>+
>+        if self.tsInfo.changed:
>+            (rescode, restring) = self.resolveDeps()
>+            
>         return rescode, restring
> 
>     def runTransaction(self, cb):
>Index: yum/depsolve.py
>===================================================================
>RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
>retrieving revision 1.79
>diff -u -u -w -r1.79 depsolve.py
>--- yum/depsolve.py	28 Feb 2006 00:29:18 -0000	1.79
>+++ yum/depsolve.py	3 Mar 2006 01:10:39 -0000
>@@ -180,6 +180,7 @@
> 
>             
>             if not deps:
>+                self.tsInfo.changed = False
>                 return (2, ['Success - deps resolved'])
> 
>             deps = unique(deps) # get rid of duplicate deps            
>@@ -251,7 +252,7 @@
> 
>             del deps
>             
>-
>+        self.tsInfo.changed = False
>         if len(errors) > 0:
>             return (1, errors)
>         if len(self.tsInfo) > 0:
>Index: yum/transactioninfo.py
>===================================================================
>RCS file: /home/groups/yum/cvs/yum/yum/transactioninfo.py,v
>retrieving revision 1.31
>diff -u -u -w -r1.31 transactioninfo.py
>--- yum/transactioninfo.py	2 Mar 2006 15:11:57 -0000	1.31
>+++ yum/transactioninfo.py	3 Mar 2006 01:10:39 -0000
>@@ -31,6 +31,7 @@
>         self.root = '/'
>         self.pkgdict = {} # key = pkgtup, val = list of TransactionMember obj
>         self.debug = 0
>+        self.changed = False
> 
>     def __len__(self):
>         return len(self.pkgdict.values())
>@@ -124,6 +125,7 @@
>                     self.debugprint("Package in same mode, skipping.")
>                     return
>         self.pkgdict[txmember.pkgtup].append(txmember)
>+        self.changed = True
> 
>     def remove(self, pkgtup):
>         """remove a package from the transaction"""
>@@ -134,6 +136,7 @@
>             txmbr.po.state = None
>         
>         del self.pkgdict[pkgtup]
>+        self.changed = True        
>     
>     def exists(self, pkgtup):
>         """tells if the pkg is in the class"""
>@@ -319,8 +322,6 @@
>         self.path = []
>         # List of loops
>         self.loops = []
>-        # Only resort if transaction data changed
>-        self.changed = True
>         ConditionalTransactionData.__init__(self)
> 
>     def _visit(self, txmbr):
>@@ -344,11 +345,6 @@
>     def add(self, txmember):
>         txmember.sortColour = TX_WHITE
>         ConditionalTransactionData.add(self, txmember)
>-        self.changed = True
>-
>-    def remove(self, pkgtup):
>-        ConditionalTransactionData.remove(self, pkgtup)
>-        self.changed = True
> 
>     def sort(self):
>         if self._sorted and not self.changed:

Actions: View | Diff

Attachments on bug 176257: 125577