diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-07 10:24:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-09 12:32:36 +0200 |
| commit | e7092a60bbdbd2b36bc31c77c40716baebe079aa (patch) | |
| tree | 689f0b2c7e6b67da01fefde466a58944e8bdaa10 | |
| parent | 64015e757529ae7ee8f3dd2444fb7444b436fefb (diff) | |
Fix bug in package_skeleton::reload_defaults()
| -rw-r--r-- | bpkg/package-skeleton.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index 8e71a53..d92f513 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -338,8 +338,6 @@ namespace bpkg // construction (in evaluate_{prefer_accept,require}()): we do not add // as dependent variables that have the override origin. // - package_configuration old (move (cfg)); cfg.package = move (old.package); - scope& rs ( *bootstrap ( *this, merge_cmd_vars (dependent_cmd_vars (cfg)))->second.front ()); @@ -348,6 +346,9 @@ namespace bpkg // load_root (rs); + package_configuration old (move (cfg)); + cfg.package = move (old.package); + // Note that a configuration variable may not have a default value so we // cannot just iterate over all the config.<name>** values set on the // root scope. Our options seem to be either iterating over the variable |