diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2021-10-09 22:05:40 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-10-12 14:20:53 +0300 |
| commit | b48fc390bc1c6fa289f821bac0380267762d1238 (patch) | |
| tree | 9944de53a4c11a8948e59d5fe5fb44a150a6aed8 /bpkg/pkg-configure.cxx | |
| parent | 6beb03862724e444bf24c92031e47814c9949ae2 (diff) | |
Verify package manifest compatibility with current toolchain
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 393ed68..65718ca 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -43,16 +43,20 @@ namespace bpkg // if (n == "build2") { - if (d.constraint) - satisfy_build2 (o, package, d); + if (d.constraint && !satisfy_build2 (o, d)) + fail << "unable to satisfy constraint (" << d + << ") for package " << package << + info << "available build2 version is " << build2_version; satisfied = true; break; } else if (n == "bpkg") { - if (d.constraint) - satisfy_bpkg (o, package, d); + if (d.constraint && !satisfy_bpkg (o, d)) + fail << "unable to satisfy constraint (" << d + << ") for package " << package << + info << "available bpkg version is " << bpkg_version; satisfied = true; break; @@ -371,7 +375,8 @@ namespace bpkg l4 ([&]{trace << *p;}); - package_manifest m (pkg_verify (p->effective_src_root (c), + package_manifest m (pkg_verify (o, + p->effective_src_root (c), true /* ignore_unknown */, [&p] (version& v) {v = p->version;})); |