[yum-git] 2 commits - yum/depsolve.py

[Seth Vidal]

 yum/depsolve.py |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

New commits:
commit 98541f1bb659809f23b553fa57601d0b14d92e16
Merge: 51b5267... ff6a879...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Mar 4 11:44:37 2008 -0500

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Add documentation for new option
      Show versions when showing dups, and fix the large key problem
      Add --showduplicates option, and make search obey showdupesfromrepos

commit 51b5267a2321f47fc55e0652670d290e5fb6cf57
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Mar 4 11:41:44 2008 -0500

    - make sure on mutual obsoletes we do _something_ useful so we don't constantly oscillate
    - better debugging in _compare_providers()

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 0e1aa51..be3605b 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -938,59 +938,91 @@ class Depsolve(object):
             return x.sourcerpm == y.sourcerpm
 
         for po in pkgs:
+            self.verbose_logger.log(logginglevels.DEBUG_4,
+                _("Comparing best: %s to po: %s") %(bestpkg, po))
+
             if po == bestpkg: # if we're comparing the same one, skip it
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                     _("Same: best %s == po: %s") %(bestpkg, po))
+
                 continue
             # if best is obsoleted by any of the packages, then the obsoleter
             # is the new best    
             for obs in po.obsoletes:
                 if bestpkg.inPrcoRange('provides', obs):
+                    # make sure the best doesn't obsolete this po - if it does we're done
+                    # we do this b/c it is possible for two entries to oscillate in this
+                    # test - obsolete should trump no matter what
+                    # NOTE: mutually obsoleting providers is completely and utterly doom
+                    for obs in bestpkg.obsoletes:
+                        if po.inPrcoRange('provides', obs):
+                            self.verbose_logger.log(logginglevels.DEBUG_4,
+                             _("best %s obsoletes po: %s") %(bestpkg, po))
+                            return bestpkg
+                    self.verbose_logger.log(logginglevels.DEBUG_4,
+                       _("po %s obsoletes best: %s") %(po, bestpkg))
+                            
                     return po
-
-            # make sure the best doesn't obsolete this po - if it does we're done
-            # we do this b/c it is possible for two entries to oscillate in this
-            # test - obsolete should trump no matter what
-            # NOTE: mutually obsoleting providers is completely and utterly doom
-            for obs in bestpkg.obsoletes:
-                if po.inPrcoRange('provides', obs):
-                    return bestpkg
                     
             if reqpo.arch != 'noarch':
                 best_dist = archDifference(reqpo.arch, bestpkg.arch)
                 if isMultiLibArch(): # only go to the next one if we're multilib - i686 can satisfy i386 deps
                     if best_dist == 0: # can't really use best's arch anyway...
+                        self.verbose_logger.log(logginglevels.DEBUG_4,
+                            _("better arch in po %s") %(po))
                         return po # just try the next one - can't be much worse
 
             
                 po_dist = archDifference(reqpo.arch, po.arch)
                 if po_dist > 0 and best_dist > po_dist:
+                    self.verbose_logger.log(logginglevels.DEBUG_4,
+                           _("better arch in po %s") %(po))
+                    
                     return po
                     
                 if best_dist == po_dist:
                     if (not _common_sourcerpm(reqpo, bestpkg) and
                         _common_sourcerpm(reqpo, po)):
+                        self.verbose_logger.log(logginglevels.DEBUG_4,
+                            _("po %s shares a sourcerpm with %s") %(po, reqpo))
                         return po
+                        
                     cplp = _common_prefix_len(reqpo.name, po.name)
                     cplb = _common_prefix_len(reqpo.name, bestpkg.name)
                     if cplp > cplb:
+                        self.verbose_logger.log(logginglevels.DEBUG_4,
+                            _("po %s shares more of the name prefix with %s") %(po, reqpo))                    
                         return po
                     if cplp == cplb and len(po.name) < len(bestpkg.name):
+                        self.verbose_logger.log(logginglevels.DEBUG_4,
+                            _("po %s has a shorter name than best %s") %(po, bestpkg))                    
                         return po
                         
             elif (not _common_sourcerpm(reqpo, bestpkg) and
                   _common_sourcerpm(reqpo, po)):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                       _("po %s shares a sourcerpm with %s") %(po, reqpo))
                 return po
             elif (_common_prefix_len(reqpo.name, po.name) >
                   _common_prefix_len(reqpo.name, bestpkg.name)):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                  _("po %s shares more of the name prefix with %s") %(po, reqpo))                    
                 return po
             elif (_common_prefix_len(reqpo.name, po.name) <
                   _common_prefix_len(reqpo.name, bestpkg.name)):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                  _("bestpkg %s shares more of the name prefix with %s") %(bestpkg, reqpo))
                 return bestpkg
             elif len(po.name) < len(bestpkg.name):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                    _("po %s has a shorter name than best %s") %(po, bestpkg))                    
                 return po
             elif len(po.name) == len(bestpkg.name):
                 # compare arch
                 arch = rpmUtils.arch.getBestArchFromList([po.arch, bestpkg.arch])
                 if arch == po.arch:
+                    self.verbose_logger.log(logginglevels.DEBUG_4,
+                           _("better arch in po %s") %(po))
                     return po
 
         # Nothing else was better, so this is it