Attachment 158310 Details for Bug 246078 – should sort the 'best' providers by distance from requesting arch

[patch] should sort the 'best' providers by distance from requesting arch

best-including-arch-dist.patch (text/plain), 1.60 KB, created by Seth Vidal on 2007-07-01 14:33:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Seth Vidal

Created: 2007-07-01 14:33:08 UTC

Size: 1.60 KB

patch

obsolete

>Index: depsolve.py
>===================================================================
>RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
>retrieving revision 1.171
>diff -u -r1.171 depsolve.py
>--- depsolve.py	26 Jun 2007 16:01:01 -0000	1.171
>+++ depsolve.py	1 Jul 2007 14:32:01 -0000
>@@ -22,6 +22,7 @@
> import rpmUtils.transaction
> import rpmUtils.miscutils
> import rpmUtils.arch
>+from rpmUtils.arch import archDifference
> from misc import unique, version_tuple_to_string
> import rpm
> 
>@@ -568,10 +569,26 @@
>         
> 
>         # find the best one 
>+        # first, find out which arch of the ones we can choose from is closest
>+        # to the arch of the requesting pkg
>+        reqpkg = self.tsInfo.matchNaevr(name=name, ver=version, rel=release)[0]
>+        thisarch = reqpkg.arch
>         newest = provSack.returnNewestByNameArch()
>+                    
>         if len(newest) > 1: # there's no way this can be zero
>             best = newest[0]
>             for po in newest[1:]:
>+                if thisarch != 'noarch':
>+                    best_dist = archDifference(thisarch, best.arch)
>+                    po_dist = archDifference(thisarch, po.arch)
>+                    if po_dist > 0 and best_dist > po_dist:
>+                        best = po
>+                        continue
>+                    if best_dist == po_dist:
>+                        if len(po.name) < len(best.name):
>+                            best=po
>+                            continue
>+                            
>                 if len(po.name) < len(best.name):
>                     best = po
>                 elif len(po.name) == len(best.name):

Actions: View | Diff

Attachments on bug 246078: 158116 | 158119 | 158121 | 158310