#380 Use mockbuild.util.load_config instead update_config_from_file
Merged 4 years ago by ngompa. Opened 4 years ago by sergiomb.
sergiomb/FedoraReview master  into  master

file modified
+1 -4
@@ -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.

rebased onto 3bf81b5a7d0275306b01b3f92db28b5bb277ce2e

4 years ago

rebased onto 9bbd161

4 years ago

Pull-Request has been merged by ngompa

4 years ago
Metadata