From e529d4bffb7acdb0e044f172dc2f18a33bbd31fb Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Wed, 24 Oct 2007 18:18:50 -0500 Subject: allow noncontiguous cache dir specifications. --- src/py-libs/plugins/ccache.py | 2 +- src/py-libs/plugins/root_cache.py | 2 +- src/py-libs/plugins/yum_cache.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/py-libs/plugins') diff --git a/src/py-libs/plugins/ccache.py b/src/py-libs/plugins/ccache.py index 7e49221..c72bccc 100644 --- a/src/py-libs/plugins/ccache.py +++ b/src/py-libs/plugins/ccache.py @@ -26,7 +26,7 @@ class CCache(object): def __init__(self, rootObj, conf): self.rootObj = rootObj self.ccache_opts = conf - self.ccachePath = os.path.join(rootObj.cachedir, "ccache") + self.ccachePath = self.ccache_opts['dir'] % self.ccache_opts self.rootdir = rootObj.rootdir rootObj.ccacheObj = self rootObj.preExistingDeps = "ccache" diff --git a/src/py-libs/plugins/root_cache.py b/src/py-libs/plugins/root_cache.py index 0b33725..bb13357 100644 --- a/src/py-libs/plugins/root_cache.py +++ b/src/py-libs/plugins/root_cache.py @@ -28,7 +28,7 @@ class RootCache(object): def __init__(self, rootObj, conf): self.rootObj = rootObj self.root_cache_opts = conf - self.rootSharedCachePath = os.path.join(rootObj.cachedir, "root_cache") + self.rootSharedCachePath = self.root_cache_opts['dir'] % self.root_cache_opts self.rootCacheFile = os.path.join(self.rootSharedCachePath, "cache.tar.gz") self.rootCacheLock = None self.state = rootObj.state diff --git a/src/py-libs/plugins/yum_cache.py b/src/py-libs/plugins/yum_cache.py index 1feb3ef..230a1a2 100644 --- a/src/py-libs/plugins/yum_cache.py +++ b/src/py-libs/plugins/yum_cache.py @@ -28,7 +28,7 @@ class YumCache(object): def __init__(self, rootObj, conf): self.rootObj = rootObj self.yum_cache_opts = conf - self.yumSharedCachePath = os.path.join(rootObj.cachedir, "yum_cache") + self.yumSharedCachePath = self.yum_cache_opts['dir'] % self.yum_cache_opts self.state = rootObj.state self.rootdir = rootObj.rootdir rootObj.yum_cacheObj = self -- cgit