Skip to content

Commit

Permalink
hermetic: process the hermetic config earlier
Browse files Browse the repository at this point in the history
The set_config_opts_per_cmdline() method operates with
config_opts['target_arch'], and we need to read the previously chosen
target_arch before that.
  • Loading branch information
praiskup committed Sep 18, 2024
1 parent e2a455b commit be4034c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mock/py/mockbuild/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ def multiply_platform_multiplier(config_opts):
def set_config_opts_per_cmdline(config_opts, options, args):
"takes processed cmdline args and sets config options."

process_isolated_build_config(options, config_opts)

cli_opt_new = {}
for cli_opt in options.cli_config_opts:
k, v = cli_opt.split("=", 1)
Expand Down Expand Up @@ -654,8 +656,6 @@ def set_config_opts_per_cmdline(config_opts, options, args):
if config_opts["calculatedeps"]:
config_opts["plugin_conf"]["buildroot_lock_enable"] = True

process_isolated_build_config(options, config_opts)

def check_config(config_opts):
if 'root' not in config_opts:
raise exception.ConfigError("Error in configuration "
Expand Down

0 comments on commit be4034c

Please sign in to comment.