---
yum/storagefactory.py | 61 -------------------------------------------------
yum/yumRepo.py | 9 ++++---
2 files changed, 5 insertions(+), 65 deletions(-)
delete mode 100644 yum/storagefactory.py
diff --git a/yum/storagefactory.py b/yum/storagefactory.py
deleted file mode 100644
index 4edb669..0000000
--- a/yum/storagefactory.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python -tt
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# Copyright 2004 Duke University
-
-import Errors
-
-class Storage:
-
- def __init__(self):
- pass
-
- def Name(self):
- pass
-
- def GetCacheHandler(self, storedir, repoid, callback):
- pass
-
- def GetPackageSack(self):
- pass
-
-
-class StorageSqliteC(Storage):
- def __init__(self):
- import sqlitecachec
- import sqlitesack
-
- self.sqlitecache = sqlitecachec
- self.sqlitesack = sqlitesack
-
- def Name(self):
- return "sqlite-c"
-
- def GetCacheHandler(self, storedir, repoid, callback):
- return self.sqlitecache.RepodataParserSqlite(storedir, repoid,
callback)
-
- def GetPackageSack(self):
- return
self.sqlitesack.YumSqlitePackageSack(self.sqlitesack.YumAvailablePackageSqlite)
-
-
-def GetStorage():
- storage = None
-
- try:
- storage = StorageSqliteC()
- return storage
- except ImportError:
- pass
-
- raise Errors.YumBaseError, 'Could not find any working storages.'
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index c70a431..6c0118b 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -27,7 +27,8 @@ import repoMDObject
import packageSack
from repos import Repository
import parser
-import storagefactory
+import sqlitecachec
+import sqlitesack
from yum import config
from yum import misc
from constants import *
@@ -105,7 +106,7 @@ class YumPackageSack(packageSack.PackageSack):
data = [ mdtype ]
if not hasattr(repo, 'cacheHandler'):
- repo.cacheHandler = repo.storage.GetCacheHandler(
+ repo.cacheHandler = sqlitecachec.RepodataParserSqlite(
storedir=repo.cachedir,
repoid=repo.id,
callback=callback,
@@ -245,8 +246,8 @@ class YumRepository(Repository, config.RepoConf):
# callback function for handling media
self.mediafunc = None
- self.storage = storagefactory.GetStorage()
- self.sack = self.storage.GetPackageSack()
+ self.sack = sqlitesack.YumSqlitePackageSack(
+ sqlitesack.YumAvailablePackageSqlite)
self._grabfunc = None
self._grab = None
--
1.5.3.rc3.941.gaac97
_______________________________________________
Yum-devel mailing list
[email protected]
https://lists.dulug.duke.edu/mailman/listinfo/yum-devel
