[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/depsolve.py

[skvidal at osuosl.org]

 yum/depsolve.py |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 5f0af714e8bc2cd39e3a4a25f9ec8cd80bbcbc89
Merge: d49eec2... ef160b8...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Nov 2 15:47:18 2009 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Big speed boost for depsolving "large" transactions.
      Move group name bash completion to separate function so it can be used in other tools.
      Fix: Unicode unequal comparison failed to convert both arguments to Unicode
      A couple of minor opts for depsolving, in checkInstall and checkRemove
      Minor opt. for allowedMultipleInstalls() and pkg.*_names callers
      Fix rpmdb.simpleVersion() to ignore gpg-pubkeys, dito. returnPackages()
      Add utf8* calls for history, which is the minimum for real i18n there.

commit d49eec2bbe3c5c8fadf6e32296bb9ed2e8b6c266
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Nov 2 15:46:49 2009 -0500

    remove the repoid check as it seems to be causing more problems than it solves

diff --git a/yum/depsolve.py b/yum/depsolve.py
index e5b3a42..7d2b686 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -1164,12 +1164,6 @@ class Depsolve(object):
                 
                     pkgresults[po] += cpl*2
                 
-                # if a provider is from the same repo as the reqpo
-                # give it a slight nudge
-                if reqpo.repoid == po.repoid:
-                    self.verbose_logger.log(logginglevels.DEBUG_4,
-                        _('common repoid of %s between %s and %s' % (po.repoid, po, reqpo)))
-                    pkgresults[po] += 8
             pkgresults[po] += (len(po.name)*-1)
 
         bestorder = sorted(pkgresults.items(),