From cbd3cd125b574deaf1ad3c7001c5b6c9c40198ed Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 22 Dec 2018 22:42:13 +0300 Subject: Add support for $ in package manifest dependency constraint --- bpkg/pkg-verify.cxx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'bpkg/pkg-verify.cxx') diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx index d14f606..3dc2a53 100644 --- a/bpkg/pkg-verify.cxx +++ b/bpkg/pkg-verify.cxx @@ -22,8 +22,9 @@ namespace bpkg package_manifest pkg_verify (const common_options& co, const path& af, - bool ev, bool iu, + bool ev, + bool cd, bool diag) try { @@ -47,7 +48,7 @@ namespace bpkg { ifdstream is (move (pr.second.in_ofd), fdstream_mode::skip); manifest_parser mp (is, mf.string ()); - package_manifest m (mp, iu); + package_manifest m (mp, iu, cd); is.close (); if (wait ()) @@ -216,8 +217,12 @@ namespace bpkg // try { - package_manifest m ( - pkg_verify (o, a, o.deep (), o.ignore_unknown (), !o.silent ())); + package_manifest m (pkg_verify (o, + a, + o.ignore_unknown (), + o.deep () /* expand_values */, + o.deep () /* complete_depends */, + !o.silent ())); if (o.manifest ()) { -- cgit v1.1