aboutsummaryrefslogtreecommitdiff
path: root/bpkg/pkg-verify.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-12-07 13:33:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-12-07 13:33:29 +0200
commit74bbd943c042478ac550ba7bf6fec0a14ae14bcf (patch)
tree90fbe65a3fc60fa2acc068d32f4a3a789cc0a41a /bpkg/pkg-verify.cxx
parent8826b24d68f3caff30ec0b70762073760dc8eb72 (diff)
Ignoring unknown manifest entries where appropriate
Diffstat (limited to 'bpkg/pkg-verify.cxx')
-rw-r--r--bpkg/pkg-verify.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx
index 5e16410..3470e0a 100644
--- a/bpkg/pkg-verify.cxx
+++ b/bpkg/pkg-verify.cxx
@@ -21,7 +21,7 @@ using namespace butl;
namespace bpkg
{
package_manifest
- pkg_verify (const common_options& co, const path& af, bool diag)
+ pkg_verify (const common_options& co, const path& af, bool iu, bool diag)
{
// Figure out the package directory. Strip the top-level extension
// and, as a special case, if the second-level extension is .tar,
@@ -77,7 +77,7 @@ namespace bpkg
is.exceptions (ifdstream::badbit | ifdstream::failbit);
manifest_parser mp (is, mf.string ());
- package_manifest m (mp);
+ package_manifest m (mp, iu);
is.close ();
if (pr.wait ())
@@ -154,7 +154,7 @@ namespace bpkg
}
package_manifest
- pkg_verify (const dir_path& d, bool diag)
+ pkg_verify (const dir_path& d, bool iu, bool diag)
{
// Parse the manifest.
//
@@ -175,7 +175,7 @@ namespace bpkg
ifs.open (mf.string ());
manifest_parser mp (ifs, mf.string ());
- package_manifest m (mp);
+ package_manifest m (mp, iu);
// Verify package directory is <name>-<version>.
//
@@ -229,7 +229,8 @@ namespace bpkg
//
try
{
- package_manifest m (pkg_verify (o, a, !o.silent ()));
+ package_manifest m (
+ pkg_verify (o, a, o.ignore_unknown (), !o.silent ()));
if (verb && !o.silent ())
text << "valid package " << m.name << " " << m.version;