diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-05-24 09:54:14 +0200 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-06-07 21:15:37 +0300 |
| commit | 5f813283c8760f664a725a2fdd77d7a7a0b21f54 (patch) | |
| tree | ac976f2d67d25068cdeee943636ab456852a3a18 /bpkg/pkg-configure.cxx | |
| parent | 365fb95a4846fad3bf021dad1438c136b5de832e (diff) | |
Start work on loading configuration variables defaults
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index e2ecacb..23ec279 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -591,9 +591,12 @@ namespace bpkg ? dir_path (db.config) /= p->name.string () : optional<dir_path> ()); - // Note that the package could have been disfigured with --keep-config. - // Thus, we always pass config variables it may store to the package - // skeleton. + // Note on the disfigure logic: while we don't know whether the package + // has been disfigured with --keep-config or not, it has already been + // done physically and if without --keep-config, then config.build has + // been removed and config_variables cleaned. As a result, we can just + // proceed as disfigure=false and disfigure=true will be taken care + // automatically (because then things have been removed/cleaned). // pkg_configure (o, db, @@ -605,6 +608,7 @@ namespace bpkg db, *ap, move (vars), + false /* disfigure */, &p->config_variables, move (src_root), move (out_root)), |