diff options
Diffstat (limited to 'bpkg/package-skeleton.cxx')
| -rw-r--r-- | bpkg/package-skeleton.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
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_); } } |