rpms/yum/devel 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch, NONE, 1.1 yum.spec, 1.213, 1.214

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	yum.spec 
Added Files:
	0001-gotta-check-both-not-either-otherwise-filedeps-do.patch 
Log Message:
* Sat May 17 2008 Jesse Keating <jkeating at redhat.com> - 3.2.16-2
- Add upstream patch to make filedeps work again


0001-gotta-check-both-not-either-otherwise-filedeps-do.patch:

--- NEW FILE 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch ---
>From 7a99a04d7f121a547d9af82738cd64b2fa8b04ca Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal at fedoraproject.org>
Date: Sat, 17 May 2008 07:43:42 -0400
Subject: [PATCH] gotta check both, not either - otherwise filedeps don't work :(

---
 yum/sqlitesack.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index c9fc26c..0b5d3e1 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -766,7 +766,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         # If it's not a provides or a filename, we are done
         if prcotype != "provides":
             return results
-        if not glob or name[0] != '/':
+        if not glob and name[0] != '/':
             return results
 
         # If it is a filename, search the primary.xml file info
-- 
1.5.5.1



Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- yum.spec	16 May 2008 14:47:09 -0000	1.213
+++ yum.spec	17 May 2008 11:58:37 -0000	1.214
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.16
-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-gotta-check-both-not-either-otherwise-filedeps-do.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
+* Sat May 17 2008 Jesse Keating <jkeating at redhat.com> - 3.2.16-2
+- Add upstream patch to make filedeps work again
+
 * Fri May 16 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.16-1
 - 3.2.16