From e7092a60bbdbd2b36bc31c77c40716baebe079aa Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 7 Jun 2022 10:24:52 +0200 Subject: Fix bug in package_skeleton::reload_defaults() --- bpkg/package-skeleton.cxx | 5 +++-- 1 file 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.** values set on the // root scope. Our options seem to be either iterating over the variable -- cgit v1.1