diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2007-10-24 18:18:50 -0500 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2007-10-24 18:18:50 -0500 |
| commit | e529d4bffb7acdb0e044f172dc2f18a33bbd31fb (patch) | |
| tree | d2197a739ec8ade4ee8ed8def71fe268c4ce1cf1 /src/py-libs | |
| parent | 0c6265c09a45ce208d5d0f8fab9a48531dfdcdac (diff) | |
| download | mock-e529d4bffb7acdb0e044f172dc2f18a33bbd31fb.tar.gz mock-e529d4bffb7acdb0e044f172dc2f18a33bbd31fb.tar.xz mock-e529d4bffb7acdb0e044f172dc2f18a33bbd31fb.zip | |
allow noncontiguous cache dir specifications.
Diffstat (limited to 'src/py-libs')
| -rw-r--r-- | src/py-libs/backend.py | 6 | ||||
| -rw-r--r-- | src/py-libs/plugins/ccache.py | 2 | ||||
| -rw-r--r-- | src/py-libs/plugins/root_cache.py | 2 | ||||
| -rw-r--r-- | src/py-libs/plugins/yum_cache.py | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/py-libs/backend.py b/src/py-libs/backend.py index 1f24955..0d4f7c3 100644 --- a/src/py-libs/backend.py +++ b/src/py-libs/backend.py @@ -73,6 +73,11 @@ class Root(object): self.plugins = config['plugins'] self.pluginConf = config['plugin_conf'] self.pluginDir = config['plugin_dir'] + for key in self.pluginConf.keys(): + if not key.endswith("_opts"): continue + self.pluginConf[key]["basedir"] = self.basedir + self.pluginConf[key]["cache_topdir"] = self.cachedir + self.pluginConf[key]["root"] = self.sharedRootName # mount/umount self.umountCmds = ['umount -n %s/proc' % self.rootdir, @@ -141,7 +146,6 @@ class Root(object): # --> no /etc/yum.conf symlink (F7 and above) # create our base directory heirarchy - mock.util.mkdirIfAbsent(self.cachedir) mock.util.mkdirIfAbsent(self.basedir) mock.util.mkdirIfAbsent(self.rootdir) 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 |