[Yum-devel] [PATCH 3/3] Don't integrate negative pkgnames with provides, probably fine but...
James Antill
james at and.org
Mon Apr 12 16:21:34 UTC 2010
---
yum/rpmsack.py | 6 ++++--
yum/sqlitesack.py | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 2b932cf..e113802 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -146,6 +146,7 @@ class RPMDBPackageSack(PackageSackBase):
self._tup2pkg = {}
self._completely_loaded = False
self._pkgmatch_fails = set()
+ self._provmatch_fails = set()
self._simple_pkgtup_list = []
self._get_pro_cache = {}
self._get_req_cache = {}
@@ -193,6 +194,7 @@ class RPMDBPackageSack(PackageSackBase):
self._tup2pkg = {}
self._completely_loaded = False
self._pkgmatch_fails = set()
+ self._provmatch_fails = set()
self._simple_pkgtup_list = []
self._get_pro_cache = {}
self._get_req_cache = {}
@@ -323,11 +325,11 @@ class RPMDBPackageSack(PackageSackBase):
return result
def searchProvides(self, name):
- if name in self._pkgmatch_fails:
+ if name in self._provmatch_fails:
return []
ret = self.searchPrco(name, 'provides')
if not ret:
- self._pkgmatch_fails.add(name)
+ self._provmatch_fails.add(name)
return ret
def searchRequires(self, name):
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 8a4ec8b..344a966 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -429,6 +429,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
self._pkgtup2pkgs = {}
self._pkgnames_loaded = set()
self._pkgmatch_fails = set()
+ self._provmatch_fails = set()
self._arch_allowed = None
self._pkgExcluder = []
self._pkgExcludeIds = {}
@@ -493,6 +494,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
self._pkgname2pkgkeys = {}
self._pkgnames_loaded = set()
self._pkgmatch_fails = set()
+ self._provmatch_fails = set()
self._pkgtup2pkgs = {}
self._search_cache = {
'provides' : { },
@@ -1374,11 +1376,11 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
def searchProvides(self, name):
"""return list of packages providing name (any evr and flag)"""
- if name in self._pkgmatch_fails:
+ if name in self._provmatch_fails:
return []
ret = self.searchPrco(name, "provides")
if not ret:
- self._pkgmatch_fails.add(name)
+ self._provmatch_fails.add(name)
return ret
def searchRequires(self, name):
--
1.6.6.1
More information about the Yum-devel
mailing list