From b48fc390bc1c6fa289f821bac0380267762d1238 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 9 Oct 2021 22:05:40 +0300 Subject: Verify package manifest compatibility with current toolchain --- bpkg/pkg-configure.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'bpkg/pkg-configure.cxx') 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;})); -- cgit v1.1