Attachment 306425 Details for Bug 447707 – Possible change to up2date to handle a special case

[patch] Possible change to up2date to handle a special case

up2date.patch.bz477707 (text/plain), 3.06 KB, created by John Matthews on 2008-05-22 21:03:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Matthews

Created: 2008-05-22 21:03:56 UTC

Size: 3.06 KB

patch

obsolete

>Index: depSolver.py
>===================================================================
>--- depSolver.py	(revision 172884)
>+++ depSolver.py	(working copy)
>@@ -278,7 +278,7 @@
> #                        if up2dateUtils.isObsoleted(obs, newp):
>                         # if it's *not* the right version, add the package back 
>                         # into the transaction
>-                        if not up2dateUtils.isObsoleted(obs, newp):
>+                        if not up2dateUtils.isObsoleted(obs, newp) or self.__specialCaseCircObs(newp):
>                             # since were iterating over the packages that the obsoletes pull
>                             # in, we need to check to see if its in self.selected again
> 
>@@ -374,10 +374,11 @@
>                 for ob in obs:
> #                    print "isObsolete(%s, %s): %s " (ob, pkg, up2dateUtils.isObsoleted(ob,pkg))
>                     if up2dateUtils.isObsoleted(ob, pkg):
>-			self.log.log_debug("Package %s is obsoleted by %s" % (pkg, ob))
>-                        # it's obsoleted, dont install it
>-			if pkg in solved:
>-                            solved.remove(pkg)
>+                        if not self.__specialCaseCircObs(pkg):
>+                            # it's obsoleted, dont install it 
>+                            self.log.log_me("Package %s is obsoleted by %s" % (pkg, ob))
>+                            if pkg in solved:
>+                                solved.remove(pkg)
>         
>                 
>         # if we did not get a solution pack back, try looking at the
>@@ -470,7 +471,33 @@
>                 changed = 0
>         
>         return changed
>-        
>+
>+
>+    def __specialCaseCircObs(self, pkg):
>+        #This method was written to handle a special case of a circular obsolete
>+        #dependency.  Package "a-1" obsoletes all "b".  And package "b-1" obsoletes all "a".
>+        #Now assume that an updated "a-2" is released which removes the obsoletes, 
>+        #PLUS it now adds a new dependency on "b-2"
>+        #Here's the problem, assume that "a-1" is installed your machine and you 
>+        #attempt an update to "a-2" through a hosted/sat repo, (not doing a local dir repo upgrade)
>+        #1) Package "a-2" will bring in "b-2" as a dep.
>+        #2) depSolver looks at installed packages and see that "a-1" obsoletes all "b", so "b-2" is 
>+        #discarded.
>+        #3) "a-2" is attempts to install and fails since "b-2" was dropped.
>+        #
>+        #This method looks for that special case, if it detects we are installing a newer version
>+        #of something which obsoletes a dep, it will return True.
>+        #self.log.log_me("solved = %s, self.selected = %s" % (solved, self.selected))
>+        obsPkgList = self.obsoletes[pkg[0]]
>+        for obsPkg in obsPkgList:
>+            for temp in self.selected:
>+                if obsPkg[0] == temp[0]:
>+                    self.log.log_me("Don't remove %s, we are upgrading %s with %s" % (pkg, obsPkg, temp))
>+                    return True
>+        return False
>+
>+
>+
>     # Solve conflicts
>     def __conflicts(self, conflicts):        
>         if not conflicts:

Actions: View | Diff

Attachments on bug 447707: 306425