rpms/yum/F-9 0001-check-reqpo-exists-in-compare_providers.patch, NONE, 1.1 yum.spec, 1.217, 1.218

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/pkgs/rpms/yum/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12848

Modified Files:
	yum.spec 
Added Files:
	0001-check-reqpo-exists-in-compare_providers.patch 
Log Message:
apply fix for compare_providers() from upstream



0001-check-reqpo-exists-in-compare_providers.patch:

--- NEW FILE 0001-check-reqpo-exists-in-compare_providers.patch ---
commit 63540521709205dd601994e2b05b7ddd3712b3a1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Jul 10 12:21:29 2008 -0400

    make sure the reqpo exists before we compare it

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 8bb2cf1..2577cef 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -986,8 +986,13 @@ class Depsolve(object):
                     if obsoleted:
                         pkgresults[po] -= 1024
                         break
-
-                for thisarch in (reqpo.arch, getBestArch()):
+                
+                if reqpo:
+                    arches = (reqpo.arch, getBestArch())
+                else:
+                    arches = (getBestArch())
+                
+                for thisarch in arches:
                     res = _compare_arch_distance(po, nextpo, thisarch)
                     if not res:
                         continue
@@ -1001,13 +1006,13 @@ class Depsolve(object):
                 self.verbose_logger.log(logginglevels.DEBUG_4,
                     _('common sourcerpm %s and %s' % (po, reqpo)))
                 pkgresults[po] += 20
-            
-            cpl = _common_prefix_len(po.name, reqpo.name)
-            if cpl > 2:
-                self.verbose_logger.log(logginglevels.DEBUG_4,
-                    _('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
-            
-                pkgresults[po] += cpl*2
+            if reqpo:
+                cpl = _common_prefix_len(po.name, reqpo.name)
+                if cpl > 2:
+                    self.verbose_logger.log(logginglevels.DEBUG_4,
+                        _('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
+                
+                    pkgresults[po] += cpl*2
             
             pkgresults[po] += (len(po.name)*-1)
 


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/F-9/yum.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- yum.spec	9 Jul 2008 14:33:07 -0000	1.217
+++ yum.spec	10 Jul 2008 16:48:30 -0000	1.218
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch1: yum-mirror-priority.patch
 Patch2: yum-manpage-files.patch
 Patch3: yum-multilib-policy-best.patch
+Patch4:	0001-check-reqpo-exists-in-compare_providers.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -55,6 +56,7 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p1
 
 %build
 make
@@ -103,6 +105,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Jul 10 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.17-2
+- add patch from upstream for bug in compare_providers
+
 * Wed Jul  9 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.17-1
 - 3.2.17