summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2007-12-14 16:33:09 -0600
committerClark Williams <williams@redhat.com>2007-12-14 16:33:09 -0600
commit39ee6e19397207468751d6308e0a7895543d9733 (patch)
tree6a6c7fed9fe04642510f81a65b84366d312d267c
parentd4458262ddcd3d55ba7009ff3dd131947f4f01e6 (diff)
downloadmock-39ee6e19397207468751d6308e0a7895543d9733.tar.gz
mock-39ee6e19397207468751d6308e0a7895543d9733.tar.xz
mock-39ee6e19397207468751d6308e0a7895543d9733.zip
replaced references to rootdir with calls to makeChrootPath()
-rw-r--r--py/mock/plugins/root_cache.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/py/mock/plugins/root_cache.py b/py/mock/plugins/root_cache.py
index 5082925..81f7c5f 100644
--- a/py/mock/plugins/root_cache.py
+++ b/py/mock/plugins/root_cache.py
@@ -30,7 +30,6 @@ class RootCache(object):
self.rootCacheFile = os.path.join(self.rootSharedCachePath, "cache.tar.gz")
self.rootCacheLock = None
self.state = rootObj.state
- self.rootdir = rootObj.rootdir
rootObj.rootCacheObj = self
rootObj.addHook("preinit", self._rootCachePreInitHook)
rootObj.addHook("postinit", self._rootCachePostInitHook)
@@ -75,7 +74,7 @@ class RootCache(object):
if os.path.exists(self.rootCacheFile) and self.rootObj.chrootWasCleaned:
self.state("unpacking cache")
self._rootCacheLock()
- mock.util.do("tar xzf %s -C %s" % (self.rootCacheFile, self.rootdir))
+ mock.util.do("tar xzf %s -C %s" % (self.rootCacheFile, rootObj.makeChrootPath()))
self._rootCacheUnlock()
self.chroot_setup_cmd = "update"
self.rootObj.chrootWasCleaned = False
@@ -86,6 +85,6 @@ class RootCache(object):
if self.rootObj.chrootWasCleaned:
self.state("creating cache")
self._rootCacheLock(shared=0)
- mock.util.do("tar czf %s -C %s ." % (self.rootCacheFile, self.rootdir))
+ mock.util.do("tar czf %s -C %s ." % (self.rootCacheFile, self.rootObj.makeChrootPath()))
self._rootCacheUnlock()