From cdbf968d003392a08c6dda204023e51a8b4e1e8e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 14 Jun 2022 12:54:20 +0200
Subject: Fix few logic bugs in configuration negotiation

---
 bpkg/package-skeleton.cxx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'bpkg/package-skeleton.cxx')

diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx
index 72192ff..c98d48d 100644
--- a/bpkg/package-skeleton.cxx
+++ b/bpkg/package-skeleton.cxx
@@ -512,11 +512,14 @@ namespace bpkg
             {
               if (config_variable_value* ov = old.find (v.name))
               {
-                assert (ov->origin == variable_origin::buildfile);
-
-                v.origin = variable_origin::buildfile;
-                v.dependent = move (ov->dependent);
-                v.confirmed = ov->confirmed;
+                if (ov->origin == variable_origin::buildfile)
+                {
+                  v.origin = variable_origin::buildfile;
+                  v.dependent = move (ov->dependent);
+                  v.confirmed = ov->confirmed;
+                }
+                else
+                  assert (ov->origin == variable_origin::override_);
               }
             }
 
-- 
cgit v1.1