diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2023-08-23 20:37:00 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2023-09-25 11:35:25 +0300 |
| commit | b48bd809a4760bc6e8718adc38837fe62bce1c20 (patch) | |
| tree | 8830d33b211191f6f080d758802450479746758d /bpkg/pkg-configure.cxx | |
| parent | 668ffb5d3258945e35f8f6e62d0395aacc219e23 (diff) | |
Fix pkg-build not to issue 'unable to reconfigure dependent' instead of 'unable to up/downgrade package' error message
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 53c104e..c145b28 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -422,9 +422,13 @@ namespace bpkg // In the reconfiguration mode ban the usage of the selected // alternative dependency configuration variables in the subsequent - // enable and reflect clauses. + // enable and reflect clauses, unless we are also unconstraining + // dependencies (which indicates it's a relaxed mode that precedes + // a drop or failure with better diagnostics). // - if (alts == nullptr && !manual && (da.prefer || da.require)) + if (alts == nullptr && !manual && + unconstrain_deps == nullptr && + (da.prefer || da.require)) { for (const dependency& d: da) banned_var_prefixes.push_back ( |