| |
@@ -177,11 +177,8 @@
|
| |
# we need disable trace from mock.util to avoid a lot of spurious
|
| |
# messages which are send to stdout
|
| |
logging.getLogger("trace").propagate = 0
|
| |
- config_opts = mockbuild.util.setup_default_config_opts(None, "unknown",
|
| |
- get_paths()['purelib'])
|
| |
- config_opts['config_paths'] = []
|
| |
+ config_opts = mockbuild.util.load_config(mockdir, config, None, "unknown", get_paths()['purelib'])
|
| |
config_opts['__jinja_expand'] = True
|
| |
- mockbuild.util.update_config_from_file(config_opts, path, None)
|
| |
self.mock_root = config_opts["root"]
|
| |
if Settings.uniqueext:
|
| |
self.mock_root += Settings.uniqueext
|
| |
to simplify the code and make the code more robust, i.e. we don't need to
initialize any variables anymore.