rpms/yum/devel yum-exception.patch,NONE,1.1 yum.spec,1.166,1.167

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25433

Modified Files:
	yum.spec 
Added Files:
	yum-exception.patch 
Log Message:
add one more obvious fix, too.



yum-exception.patch:

--- NEW FILE yum-exception.patch ---
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 5a2882a..7fb211f 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -667,7 +667,7 @@ class Depsolve(object):
                 if confpkg.name not in self.conf.exactarchlist:
                     try:
                         pkgs = self.pkgSack.returnNewestByName(confpkg.name)
-                    except PackageSackError:
+                    except Errors.PackageSackError:
                         self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s" %(confpkg.name,))
                         pkgs = []
                     archs = {}
@@ -679,7 +679,7 @@ class Depsolve(object):
                 else:
                     try:
                         po = self.pkgSack.returnNewestByNameArch((confpkg.name,confpkg.arch))[0]
-                    except PackageSackError:
+                    except Errors.PackageSackError:
                         self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s.%s" %(confpkg.name,confpkg.arch))
                         po = None
                 if po and po.pkgtup not in uplist:


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- yum.spec	25 Jul 2007 14:41:55 -0000	1.166
+++ yum.spec	25 Jul 2007 14:44:50 -0000	1.167
@@ -11,6 +11,7 @@
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
 Patch1: yum-ctrl-c.patch
+Patch2: yum-exception.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -47,6 +48,7 @@
 %setup -q
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .ctrl-c
+%patch2 -p1 -b .exception
 
 %build
 make
@@ -93,7 +95,7 @@
 %changelog
 * Wed Jul 25 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.2-3
 - include panu's rpm-signal-catch patch from yum head.
-
+- include exception fix, too.
 
 * Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 3.2.2-2
 - remove yum-updatesd subpackage; moving to the separate version