rpms/yum/devel rpmdb-unresolved.patch, NONE, 1.1 yum.spec, 1.174, 1.175

Seth Vidal (skvidal) fedora-extras-commits at redhat.com
Wed Aug 29 16:10:57 UTC 2007


Author: skvidal

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

Modified Files:
	yum.spec 
Added Files:
	rpmdb-unresolved.patch 
Log Message:

more patches from git-HEAD


rpmdb-unresolved.patch:

--- NEW FILE rpmdb-unresolved.patch ---
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 57933cb..4075116 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -822,7 +822,7 @@ class Depsolve(object):
                 continue
             if req in provs:
                 continue
-            if req in oldreqs:
+            if req in oldreqs and self.rpmdb.getProvides(*req):
                 continue
             
             self.verbose_logger.log(logginglevels.DEBUG_2, "looking for %s as a requirement of %s", req, txmbr)


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- yum.spec	29 Aug 2007 14:27:10 -0000	1.174
+++ yum.spec	29 Aug 2007 16:10:24 -0000	1.175
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
 Patch1: version-None-tuple.patch
+Patch2: rpmdb-unresolved.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -48,6 +49,7 @@
 %setup -q
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .ver-to-none
+%patch2 -p1 -b .unresolved
 
 %build
 make
@@ -93,6 +95,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-3
+- patch from git-HEAD - unresolved deps
+
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-2
 - add ver-to-none patch to fix, a lot of things, actually.
 




More information about the fedora-extras-commits mailing list