diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2023-10-20 12:14:33 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2023-10-20 12:36:48 +0300 |
| commit | 4f2a74494532065205caf508f18c7521b184ee32 (patch) | |
| tree | a108355d776644cb60759e6deeec539049487e04 /bpkg/pkg-build.cxx | |
| parent | 849b2b0af9af3c401fe342b1f8da3d2ba8fb9251 (diff) | |
Fix 'unordered build' assertion failure due to bug in build_packages::order()
Diffstat (limited to 'bpkg/pkg-build.cxx')
| -rw-r--r-- | bpkg/pkg-build.cxx | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 9cf466c..1aaed99 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -4551,24 +4551,16 @@ namespace bpkg // appear (e.g., on the plan) last. // for (const dep& d: deps) - pkgs.order (d.db, - d.name, - nullopt /* buildtime */, - find_prereq_database, - false /* reorder */); + pkgs.order (d.db, d.name, find_prereq_database, false /* reorder */); for (const build_package& p: reverse_iterate (hold_pkgs)) - pkgs.order (p.db, - p.name (), - nullopt /* buildtime */, - find_prereq_database); + pkgs.order (p.db, p.name (), find_prereq_database); for (const auto& rd: rpt_depts) pkgs.order (rd.first.db, rd.first.name, - nullopt /* buildtime */, find_prereq_database, - false /* reorder */); + false /* reorder */); for (const postponed_configuration& cfg: postponed_cfgs) { @@ -4577,11 +4569,7 @@ namespace bpkg if (d.second.existing) { const package_key& p (d.first); - - pkgs.order (p.db, - p.name, - nullopt /* buildtime */, - find_prereq_database); + pkgs.order (p.db, p.name, find_prereq_database); } } } @@ -4590,10 +4578,7 @@ namespace bpkg { assert (p->recursive_collection); - pkgs.order (p->db, - p->name (), - nullopt /* buildtime */, - find_prereq_database); + pkgs.order (p->db, p->name (), find_prereq_database); } // Collect and order all the dependents that we will need to @@ -4617,9 +4602,8 @@ namespace bpkg if (sp != nullptr && sp->hold_package) pkgs.order (db, p.name, - nullopt /* buildtime */, find_prereq_database, - false /* reorder */); + false /* reorder */); }; if (p.db != nullptr) |