From b48bd809a4760bc6e8718adc38837fe62bce1c20 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 23 Aug 2023 20:37:00 +0300 Subject: Fix pkg-build not to issue 'unable to reconfigure dependent' instead of 'unable to up/downgrade package' error message --- bpkg/pkg-configure.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bpkg/pkg-configure.cxx') 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 ( -- cgit v1.1