rpms/yum/F-8 yum-3.2.8-livecd-work.patch, NONE, 1.1 yum.spec, 1.188, 1.189

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/yum/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1844

Modified Files:
	yum.spec 
Added Files:
	yum-3.2.8-livecd-work.patch 
Log Message:
livecd work patch from upstream



yum-3.2.8-livecd-work.patch:

--- NEW FILE yum-3.2.8-livecd-work.patch ---
diff --git a/yum/__init__.py b/yum/__init__.py
index f99adde..92c8d26 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -362,7 +362,7 @@ class YumBase(depsolve.Depsolve):
         """populates the package sacks for information from our repositories,
            takes optional archlist for archs to include"""
 
-        if self._pkgSack is not None and thisrepo is None:
+        if self._pkgSack and thisrepo is None:
             self.verbose_logger.log(logginglevels.DEBUG_4,
                 'skipping reposetup, pkgsack exists')
             return self._pkgSack


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/F-8/yum.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- yum.spec	3 Dec 2007 18:12:58 -0000	1.188
+++ yum.spec	5 Dec 2007 22:02:21 -0000	1.189
@@ -3,13 +3,14 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.8
-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
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
+Patch1: yum-3.2.8-livecd-work.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
+%patch1 -p1 -b .livecd
 
 %build
 make
@@ -91,6 +93,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Dec  5 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.8-2
+- livecd work patch
+
 * Mon Dec  3 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.8-1
 - 3.2.8