diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-19 21:44:30 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-19 21:44:30 -0600 |
| commit | 79ad55bfcd2afbeedda8f955e484a41c01939545 (patch) | |
| tree | 415551e8d3b62c8c411313f9d422f80263929f64 /py/mock | |
| parent | 50b03e60318c31224c0df9a7405751d50e8abace (diff) | |
| download | mock-79ad55bfcd2afbeedda8f955e484a41c01939545.tar.gz mock-79ad55bfcd2afbeedda8f955e484a41c01939545.tar.xz mock-79ad55bfcd2afbeedda8f955e484a41c01939545.zip | |
fix resultdir for --uniqueext builds without resultdir specified. try to standardize on single-quotes for indexing hashes.
Diffstat (limited to 'py/mock')
| -rw-r--r-- | py/mock/backend.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/py/mock/backend.py b/py/mock/backend.py index 9b5fba9..1f6f019 100644 --- a/py/mock/backend.py +++ b/py/mock/backend.py @@ -33,11 +33,10 @@ class Root(object): self.buildrootLock = None self.sharedRootName = config['root'] - root = self.sharedRootName if config.has_key('unique-ext'): - root = "%s-%s" % (root, config['unique-ext']) + config['root'] = "%s-%s" % (config['root'], config['unique-ext']) - self.basedir = os.path.join(config['basedir'], root) + self.basedir = os.path.join(config['basedir'], config['root']) self.target_arch = config['target_arch'] self._rootdir = os.path.join(self.basedir, 'root') self.homedir = config['chroothome'] @@ -76,11 +75,11 @@ class Root(object): 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.cache_topdir - self.pluginConf[key]["cachedir"] = self.cachedir - self.pluginConf[key]["root"] = self.sharedRootName + if not key.endswith('_opts'): continue + self.pluginConf[key]['basedir'] = self.basedir + self.pluginConf[key]['cache_topdir'] = self.cache_topdir + self.pluginConf[key]['cachedir'] = self.cachedir + self.pluginConf[key]['root'] = self.sharedRootName # mount/umount self.umountCmds = ['umount -n %s' % self.makeChrootPath('proc'), |