From 60c5bf36100ccc15421a87f4b566849d2468d396 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 28 Sep 2020 21:40:59 +0300 Subject: Run build2 dist meta-operation in pkg-checkout with '--no-external-modules !config.dist.bootstrap=true' --- bpkg/pkg-checkout.cxx | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'bpkg/pkg-checkout.cxx') diff --git a/bpkg/pkg-checkout.cxx b/bpkg/pkg-checkout.cxx index 05875a4..9be09c8 100644 --- a/bpkg/pkg-checkout.cxx +++ b/bpkg/pkg-checkout.cxx @@ -219,18 +219,6 @@ namespace bpkg // dir_path pd (td / path_cast (pl->location)); - // Verify the package prerequisites are all configured since the dist - // meta-operation generally requires all imports to be resolvable. - // - package_manifest m (pkg_verify (pd, - true /* ignore_unknown */, - [&ap] (version& v) {v = ap->version;})); - - pkg_configure_prerequisites (o, - t, - convert (move (m.dependencies)), - m.name); - // Form the buildspec. // string bspec ("dist('"); @@ -245,7 +233,11 @@ namespace bpkg // Distribute. // - // Note that on failure the package stays in the existing (working) + // Note that we are using the bootstrap distribution mode (and also skip + // bootstrapping external modules) to make sure a package can be checked + // out without its dependencies being present. + // + // Note also that on failure the package stays in the existing (working) // state. // // At first it may seem we have a problem: an existing package with the @@ -264,7 +256,9 @@ namespace bpkg run_b (o, verb_b::progress, - strings ({"config.dist.root='" + c.representation () + "'"}), + "--no-external-modules", + "!config.dist.bootstrap=true", + "config.dist.root='" + c.representation () + "'", bspec); // Revert the fix-ups. -- cgit v1.1