From b978ab110d5dd11b4efecb14830c849f89210919 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 10 Feb 2022 12:21:22 +0200
Subject: Minor tweaks to package skeleton implementation

---
 bpkg/pkg-build.cxx | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'bpkg/pkg-build.cxx')

diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx
index f4432b6..73d2284 100644
--- a/bpkg/pkg-build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -1267,14 +1267,12 @@ namespace bpkg
         if (size_t n = deps.size ())
           pkg.dependencies->reserve (n);
 
-        optional<dir_path> src_root;
-        if (pkg.external () && !pkg.disfigure)
-          src_root = sp->src_root;
-
         pkg.skeleton = package_skeleton (pdb,
                                          *ap,
                                          pkg.config_vars,
-                                         move (src_root));
+                                         (pkg.external () && !pkg.disfigure
+                                          ? sp->src_root
+                                          : nullopt));
       }
 
       dependencies& sdeps (*pkg.dependencies);
@@ -7663,7 +7661,7 @@ namespace bpkg
       //
       // Note that for other cases the preservation of the configuration is
       // still a @@ TODO (the idea is to use our config.config.{save,load}
-      // machinery).
+      // machinery). Also see "parallel" logic in package_skeleton.
       //
       // Commits the transaction.
       //
@@ -8099,11 +8097,12 @@ namespace bpkg
         }
         else
         {
-          optional<dir_path> src_root;
-          if (p.external () && !p.disfigure)
-            src_root = sp->src_root;
-
-          package_skeleton ps (pdb, *ap, p.config_vars, move (src_root));
+          package_skeleton ps (pdb,
+                               *ap,
+                               p.config_vars,
+                               (p.external () && !p.disfigure
+                                ? sp->src_root
+                                : nullopt));
 
           pkg_configure (o,
                          pdb,
@@ -8134,11 +8133,12 @@ namespace bpkg
         if (dap == nullptr)
           dap = make_available (o, pdb, sp);
 
-        optional<dir_path> src_root;
-        if (p.external () && !p.disfigure)
-          src_root = sp->src_root;
-
-        package_skeleton ps (pdb, *dap, p.config_vars, move (src_root));
+        package_skeleton ps (pdb,
+                             *dap,
+                             p.config_vars,
+                             (p.external () && !p.disfigure
+                              ? sp->src_root
+                              : nullopt));
 
         // @@ Note that on reconfiguration the dependent looses the potential
         //    configuration variables specified by the user on some previous
-- 
cgit v1.1