diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-13 15:13:46 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-14 14:46:52 +0200 |
| commit | f4bec0b31dfe117aca94c2d72d489460c1f51057 (patch) | |
| tree | da283a4fb889440607224c62c5053efc183222d6 | |
| parent | 620186a31a28aaa15ab14c774fd56b14cc8d392d (diff) | |
Fix bug in originating dependent confirmation logic
| -rw-r--r-- | bpkg/package-skeleton.cxx | 4 | ||||
| -rw-r--r-- | bpkg/pkg-build.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index 49d375a..fb76f67 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -343,7 +343,7 @@ namespace bpkg // Note also that on the first call we will have no configuration. And // so to keep things simple, we merge variable of the buildfile origin // into cmd_vars and then rebuild things from scratch. Note, however, - // that below we need to sort our these merged overrides into user and + // that below we need to sort out these merged overrides into user and // dependent, so we keep the old configuration for reference. // // Note also that dependent values do not clash with user overrides by @@ -416,7 +416,7 @@ namespace bpkg v.origin = variable_origin::buildfile; v.dependent = move (ov->dependent); - v.confirmed = true; + v.confirmed = ov->confirmed; } } diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 9e3ad26..ca3387f 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -6972,7 +6972,7 @@ namespace bpkg dept = move (v.dependent); if (cycle) - dr << info << v.serialize_cmdline (); + dr << "\n " << v.serialize_cmdline (); else v.undefine (); } |