aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bpkg/manifest2
-rw-r--r--bpkg/manifest.cxx11
2 files changed, 10 insertions, 3 deletions
diff --git a/bpkg/manifest b/bpkg/manifest
index 19dd960..8ad9512 100644
--- a/bpkg/manifest
+++ b/bpkg/manifest
@@ -23,6 +23,8 @@ namespace bpkg
{
using strings = std::vector<std::string>;
+ // @@ Let's create <bpkg/types> with "basic" package types.
+ //
class LIBBPKG_EXPORT version
{
public:
diff --git a/bpkg/manifest.cxx b/bpkg/manifest.cxx
index 54627e7..107c2fe 100644
--- a/bpkg/manifest.cxx
+++ b/bpkg/manifest.cxx
@@ -705,7 +705,7 @@ namespace bpkg
// used for version constrains rather than actual releases.
//
if (version.release && version.release->empty ())
- bad_name ("invalid package version release");
+ bad_value ("invalid package version release");
}
else if (n == "summary")
{
@@ -1242,8 +1242,6 @@ namespace bpkg
s.next ("package-email",
add_comment (*package_email, package_email->comment));
-
-
for (const auto& d: dependencies)
s.next ("depends",
(d.conditional
@@ -2155,6 +2153,13 @@ namespace bpkg
bad_value ("no sha256sum specified");
else if (signature.empty ())
bad_value ("no signature specified");
+
+ // Make sure this is the end.
+ //
+ nv = p.next ();
+ if (!nv.empty ())
+ throw parsing (p.name (), nv.name_line, nv.name_column,
+ "single signature manifest expected");
}
void signature_manifest::