From 9975433887ac061b2aa50189dddb9d733e57d054 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 30 May 2018 06:28:15 +0200 Subject: Allow trailing plus in package names (think libc++) --- libbpkg/package-name.cxx | 4 ++-- tests/manifest/testscript | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libbpkg/package-name.cxx b/libbpkg/package-name.cxx index c90d861..7a42ee3 100644 --- a/libbpkg/package-name.cxx +++ b/libbpkg/package-name.cxx @@ -50,9 +50,9 @@ namespace bpkg throw invalid_argument ("illegal character"); } - if (!alnum (nm.back ())) + if (!alnum (nm.back ()) && nm.back () != '+') throw invalid_argument ( - "illegal last character (must be alphabetic or digit)"); + "illegal last character (must be alphabetic, digit, or plus)"); value_ = move (nm); } diff --git a/tests/manifest/testscript b/tests/manifest/testscript index c8fdfaa..9d80bd6 100644 --- a/tests/manifest/testscript +++ b/tests/manifest/testscript @@ -56,7 +56,7 @@ : last-char : - $* -pp <'stdin:4:7: error: invalid package name: illegal last character (must be alphabetic or digit)' != 0 + $* -pp <'stdin:4:7: error: invalid package name: illegal last character (must be alphabetic, digit, or plus)' != 0 : 1 sha256sum: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 : -- cgit v1.1