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

[skvidal at osuosl.org]

 yum/depsolve.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 8ce098d99ae9e3761e46b1560804d3a8e9676b04
Merge: 221d651... 19414c8...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Sep 9 10:05:03 2009 -0400

    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:
      Added updated catalan translation by Xavier Conde

commit 221d6515355f41db767f9b257464e16a4cac9ab1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Sep 8 15:12:03 2009 -0400

    Prospective fix for https://bugzilla.redhat.com/show_bug.cgi?id=519172
    
    If we are running compare_providers() and any of the providers are updates for something installed
    then score them up just slightly and make sure to not REMOVE the items which are NOT updates
    for something installed. There still should be an obsoletes catch in here - maybe even to make sure
    that an obsoleted pkg is never considered AT ALL in compare_providers()
    
    however this makes the bug work out correctly and still has all the unittests working

diff --git a/yum/depsolve.py b/yum/depsolve.py
index d6b1b02..467f657 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -1083,7 +1083,16 @@ class Depsolve(object):
                 # could play a part ... this probably needs a better fix.
                 newest = sorted(rpmdbpkgs)[-1]
                 if newest.verLT(pkg):
-                    ipkgresults[pkg] = 0
+                    # give pkgs which are updates just a SLIGHT edge
+                    # we should also make sure that any pkg
+                    # we are giving an edge to is not obsoleted by
+                    # something else in the transaction. :(
+                    # there are many ways I hate this - this is but one
+                    ipkgresults[pkg] = 5
+            else:
+                # just b/c they're not installed pkgs doesn't mean they should
+                # be ignored entirely. Just not preferred
+                ipkgresults[pkg] = 0
 
         #  This is probably only for "renames". What happens is that pkgA-1 gets
         # obsoleted by pkgB but pkgB requires pkgA-2, now _if_ the pkgA txmbr