From fad62fd770129d79e370fc95323543581473cad8 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 29 Jan 2019 16:12:21 +0300
Subject: Fix package dependency constraint completions that could end up with
 latest snapshot

---
 bpkg/pkg-build.cxx | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

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

diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx
index 91186db..f9c84ef 100644
--- a/bpkg/pkg-build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -193,11 +193,10 @@ namespace bpkg
                     a->absolute () ? *a : c / *a,
                     true /* ignore_unknown */,
                     false /* expand_values */)
-      : pkg_verify (sp->effective_src_root (c), true /* ignore_unknown */));
-
-    // Copy the possibly fixed up version from the selected package.
-    //
-    m.version = sp->version;
+      : pkg_verify (sp->effective_src_root (c),
+                    true /* ignore_unknown */,
+                    // Copy potentially fixed up version from selected package.
+                    [&sp] (version& v) {v = sp->version;}));
 
     return make_pair (make_shared<available_package> (move (m)), move (af));
   }
@@ -2936,6 +2935,8 @@ namespace bpkg
 
               // This is a package archive.
               //
+              // Note that throwing failed from here on will be fatal.
+              //
               package_arc = true;
 
               l4 ([&]{trace << "archive '" << a << "': " << arg_string (pa);});
@@ -2994,10 +2995,20 @@ namespace bpkg
                        << "package directory: ";
 
                 package_manifest m (
-                  pkg_verify (d, true /* ignore_unknown */, diag));
+                  pkg_verify (
+                    d,
+                    true /* ignore_unknown */,
+                    [&o, &d] (version& v)
+                    {
+                      if (optional<version> pv = package_version (o, d))
+                        v = move (*pv);
+                    },
+                    diag));
 
                 // This is a package directory.
                 //
+                // Note that throwing failed from here on will be fatal.
+                //
                 package_dir = true;
 
                 l4 ([&]{trace << "directory '" << d << "': "
@@ -3011,12 +3022,8 @@ namespace bpkg
                        << "' may not be built as a dependency";
 
                 // Fix-up the package version to properly decide if we need to
-                // upgrade/downgrade the package. Note that throwing failed
-                // from here on will be fatal.
+                // upgrade/downgrade the package.
                 //
-                if (optional<version> v = package_version (o, d))
-                  m.version = move (*v);
-
                 if (optional<version> v =
                     package_iteration (o,
                                        c,
@@ -4542,7 +4549,9 @@ namespace bpkg
         assert (sp->state == package_state::unpacked);
 
         package_manifest m (
-          pkg_verify (sp->effective_src_root (c), true /* ignore_unknown */));
+          pkg_verify (sp->effective_src_root (c),
+                      true /* ignore_unknown */,
+                      [&sp] (version& v) {v = sp->version;}));
 
         pkg_configure (c, o, t, sp, m.dependencies, p.config_vars, simulate);
       }
-- 
cgit v1.1