[yum-git] Branch 'yum-3_2_X' - yum/__init__.py yum/repos.py yum/yumRepo.py

[Seth Vidal]

 yum/__init__.py |    3 +++
 yum/repos.py    |    2 ++
 yum/yumRepo.py  |    3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 81b680001f26309aff423bf9d21614cb35072974
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Aug 11 14:03:15 2008 -0400

    - when we delete a repo from our repos object, also close it
    - when we add_enable_repo make sure we call setup on it, too, just to make sure we get the dirs and caches setup
    - when _resetSack is called just set _sack to None not sack

diff --git a/yum/__init__.py b/yum/__init__.py
index 7facdd6..3457dfb 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3191,6 +3191,9 @@ class YumBase(depsolve.Depsolve):
                 mirrorlist = varReplace(mirrorlist, self.conf.yumvar)
             newrepo.mirrorlist = mirrorlist
 
+        # setup the repo
+        newrepo.setup(cache=self.conf.cache)
+
         # some reasonable defaults, (imo)
         newrepo.enablegroups = True
         newrepo.metadata_expire = 0
diff --git a/yum/repos.py b/yum/repos.py
index d290520..c4c2449 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -88,6 +88,8 @@ class RepoStorage:
 
     def delete(self, repoid):
         if self.repos.has_key(repoid):
+            thisrepo = self.repos[repoid]
+            thisrepo.close()
             del self.repos[repoid]
             
     def sort(self):
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index b2f342e..376f7db 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -278,8 +278,7 @@ class YumRepository(Repository, config.RepoConf):
         Repository.close(self)
     
     def _resetSack(self):
-        self.sack = sqlitesack.YumSqlitePackageSack(
-                sqlitesack.YumAvailablePackageSqlite)
+        self._sack = None
 
     def __getProxyDict(self):
         self.doProxyDict()