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-collect.hxx | |
parent | 849b2b0af9af3c401fe342b1f8da3d2ba8fb9251 (diff) |
Fix 'unordered build' assertion failure due to bug in build_packages::order()
Diffstat (limited to 'bpkg/pkg-build-collect.hxx')
-rw-r--r-- | bpkg/pkg-build-collect.hxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/bpkg/pkg-build-collect.hxx b/bpkg/pkg-build-collect.hxx index 181a86e..5362c65 100644 --- a/bpkg/pkg-build-collect.hxx +++ b/bpkg/pkg-build-collect.hxx @@ -1491,23 +1491,16 @@ namespace bpkg const function<add_priv_cfg_function>&, postponed_configuration* = nullptr); - // Order the previously-collected package with the specified name - // returning its positions. + // Order the previously-collected package with the specified name and + // configuration returning its position. // - // If buildtime is nullopt, then search for the specified package build in - // only the specified configuration. Otherwise, treat the package as a - // dependency and use the custom search function to find its build - // configuration. Failed that, search for it recursively (see - // package_map::find_dependency() for details). - // - // Recursively order the package dependencies being ordered failing if a + // Recursively order the collected package dependencies, failing if a // dependency cycle is detected. If reorder is true, then reorder this // package to be considered as "early" as possible. // iterator order (database&, const package_name&, - optional<bool> buildtime, const function<find_database_function>&, bool reorder = true); @@ -1674,7 +1667,6 @@ namespace bpkg iterator order (database&, const package_name&, - optional<bool> buildtime, package_refs& chain, const function<find_database_function>&, bool reorder); |