diff options
| author | Clark Williams <williams@redhat.com> | 2007-12-14 16:34:49 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2007-12-14 16:34:49 -0600 |
| commit | 64439e769bb95ff4e277deb86b1743a582dee50d (patch) | |
| tree | 12452047547da49d5148fdd5debffbe0bbda722c /py | |
| parent | 39ee6e19397207468751d6308e0a7895543d9733 (diff) | |
| parent | 184afb1852bccc8e9d1b38dea05f30af1180f122 (diff) | |
| download | mock-64439e769bb95ff4e277deb86b1743a582dee50d.tar.gz mock-64439e769bb95ff4e277deb86b1743a582dee50d.tar.xz mock-64439e769bb95ff4e277deb86b1743a582dee50d.zip | |
resolved merge conflicts
Diffstat (limited to 'py')
| -rw-r--r-- | py/mock/plugins/root_cache.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/mock/plugins/root_cache.py b/py/mock/plugins/root_cache.py index 81f7c5f..6e9c60e 100644 --- a/py/mock/plugins/root_cache.py +++ b/py/mock/plugins/root_cache.py @@ -74,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, rootObj.makeChrootPath())) + mock.util.do("tar xzf %s -C %s" % (self.rootCacheFile, self.rootObj.makeChrootPath())) self._rootCacheUnlock() self.chroot_setup_cmd = "update" self.rootObj.chrootWasCleaned = False |