diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2021-12-16 16:40:17 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-01-17 18:45:14 +0300 |
commit | f806768c53361f5404148cd4d216b10421a1288f (patch) | |
tree | c4990cc537d8635c0c77c59a10eeec9e8749f3f3 /bpkg/pkg-verify.cxx | |
parent | faf999003af1d62e90b59791126dacedf7b28105 (diff) |
Adapt to package manifest dependency classes change
Diffstat (limited to 'bpkg/pkg-verify.cxx')
-rw-r--r-- | bpkg/pkg-verify.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx index 757a2c5..a65eeef 100644 --- a/bpkg/pkg-verify.cxx +++ b/bpkg/pkg-verify.cxx @@ -54,7 +54,15 @@ namespace bpkg if (nv.name == "depends") try { - dependency_alternatives das (nv.value); + // Note that we don't have the dependent package name here (unless we + // bother to retrieve it from the manifest in advance). This may cause + // parsing of a dependency alternative to fail while verifying the + // reflect clause (see dependency_alternative for details). That is, + // however, OK since we don't expect any clauses for the build2 and + // bpkg constraints and we just ignore failures for other depends + // values (see above). + // + dependency_alternatives das (nv.value, package_name ()); if (das.buildtime) { @@ -117,7 +125,7 @@ namespace bpkg } } } - catch (const invalid_argument&) {} // Ignore + catch (const manifest_parsing&) {} // Ignore r.push_back (move (nv)); } |