[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/repos.py yum/sqlitesack.py

James Antill james at osuosl.org
Tue Jul 21 15:33:57 UTC 2009


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

New commits:
commit 5f7fd9f98a23d05a9ca439e1b30f5d2926c882b3
Author: James Antill <james at and.org>
Date:   Mon Jul 20 15:47:29 2009 -0400

    Copy quick en/dis able to repos when repo is added

diff --git a/yum/repos.py b/yum/repos.py
index ac3e197..32d3426 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -97,6 +97,7 @@ class RepoStorage:
             raise Errors.DuplicateRepoError, 'Repository %s is listed more than once in the configuration' % (repoobj.id)
         self.repos[repoobj.id] = repoobj
         if hasattr(repoobj, 'quick_enable_disable'):
+            self.quick_enable_disable.update(repoobj.quick_enable_disable)
             repoobj.quick_enable_disable = self.quick_enable_disable
         else:
             self._cache_enabled_repos = None
commit 9dd0414cd026a9db7b045e56ee4d1cb0961ca851
Author: James Antill <james at and.org>
Date:   Mon Jul 20 00:03:18 2009 -0400

    Have pkgtup not be low in excluder, so we can use pkg.pkgtup (as we do)

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 7f61190..e9b8112 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -150,14 +150,10 @@ def _excluder_match(excluder, match, regexp_match, data, e,v,r,a):
             return True
 
     elif excluder == 'pkgtup.eq':
-        if 'pkgtup' not in data:
-            data['pkgtup'] = (data['n'], a, e, v, r)
         if match == data['pkgtup']:
             return True
 
     elif excluder == 'pkgtup.in':
-        if 'pkgtup' not in data:
-            data['pkgtup'] = (data['n'], a, e, v, r)
         if data['pkgtup'] in match:
             return True
 
@@ -589,7 +585,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
             self._delPackageRK(repo, pkgKey)
             return True
 
-        data = {'n' : n.lower(), 'marked' : False}
+        data = {'n' : n.lower(), 'pkgtup' : (n, a, e, v, r), 'marked' : False}
         e = e.lower()
         v = v.lower()
         r = r.lower()


More information about the Yum-commits mailing list