aboutsummaryrefslogtreecommitdiff
path: root/bpkg/pkg-build-collect.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2023-11-02 14:40:41 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2023-11-02 15:12:46 +0300
commit300f66bb8447301bfc23b5e3bbc5b952506f0b42 (patch)
treedd37db5bee566096adc3ddb61b6817f5bea73c5b /bpkg/pkg-build-collect.cxx
parentf3ed48f053b8938c01a96f61c160e9a9c5f83562 (diff)
Fix configuration negotiation machinery to non-recursivelly collect being postponed existing dependents
Diffstat (limited to 'bpkg/pkg-build-collect.cxx')
-rw-r--r--bpkg/pkg-build-collect.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/bpkg/pkg-build-collect.cxx b/bpkg/pkg-build-collect.cxx
index a70ef10..2be737e 100644
--- a/bpkg/pkg-build-collect.cxx
+++ b/bpkg/pkg-build-collect.cxx
@@ -5704,6 +5704,13 @@ namespace bpkg
//
pi->second.wout_config = true;
+ collect_existing_dependent (o,
+ ed,
+ {p},
+ replaced_vers,
+ postponed_cfgs,
+ unsatisfied_depts);
+
postponed_existing_dependents.insert (pk);
continue;
}
@@ -6842,17 +6849,13 @@ namespace bpkg
<< ed.db << " due to bogus postponement of "
<< "dependency " << pk;});
- // Note that we pass false as the add_required_by argument since
- // the postponment is bogus and thus the originating dependency
- // for this existing dependent may not be collected.
- //
recollect_existing_dependent (o,
ed,
replaced_vers,
postponed_recs,
postponed_cfgs,
unsatisfied_depts,
- false /* add_required_by */);
+ true /* add_required_by */);
prog = true;
break;
}