From 87a284335715301fa2cea695386bfcd21a2fe781 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 26 Oct 2023 19:37:02 +0300
Subject: Load both user and dependent configurations in (pre-)reevaluate modes

---
 bpkg/package-skeleton.hxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'bpkg/package-skeleton.hxx')

diff --git a/bpkg/package-skeleton.hxx b/bpkg/package-skeleton.hxx
index bc5d25c..04abc0e 100644
--- a/bpkg/package-skeleton.hxx
+++ b/bpkg/package-skeleton.hxx
@@ -68,7 +68,8 @@ namespace bpkg
                       bool disfigure,
                       const vector<config_variable>* config_srcs,
                       optional<dir_path> src_root,
-                      optional<dir_path> out_root);
+                      optional<dir_path> out_root,
+                      bool load_old_dependent_config);
 
 
     package_key package;
@@ -253,6 +254,13 @@ namespace bpkg
     string var_prefix_; // config.<project>
 
     strings config_vars_;
+
+    // Configuration sources for variables in config_vars_ (parallel). Can
+    // only contain config_source::{user,dependent} entries (see
+    // load_old_config() for details).
+    //
+    vector<config_source> config_var_srcs_;
+
     bool disfigure_;
     const vector<config_variable>* config_srcs_; // NULL if nothing to do or
                                                  // already done.
@@ -260,6 +268,8 @@ namespace bpkg
     dir_path src_root_; // Must be absolute and normalized.
     dir_path out_root_; // If empty, the same as src_root_.
 
+    bool load_old_dependent_config_;
+
     bool created_ = false;
     bool verified_ = false;
     bool loaded_old_config_;
-- 
cgit v1.1