From e3154f3b02a61eb51f84c0911396687cb62b333e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 19 Sep 2023 13:13:05 +0200 Subject: Add `none` value to bpkg-pkg-bindist --recursive option --- bpkg/pkg-bindist.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bpkg/pkg-bindist.cxx') diff --git a/bpkg/pkg-bindist.cxx b/bpkg/pkg-bindist.cxx index 5127f7e..4639746 100644 --- a/bpkg/pkg-bindist.cxx +++ b/bpkg/pkg-bindist.cxx @@ -237,7 +237,7 @@ namespace bpkg if (m == "auto") rec = recursive_mode::auto_; else if (m == "full") rec = recursive_mode::full; else if (m == "separate") rec = recursive_mode::separate; - else + else if (m != "none") dr << fail << "unknown --recursive mode '" << m << "'"; } @@ -579,9 +579,9 @@ namespace bpkg { json::stream_serializer s (cout); - auto member = [&s] (const char* n, const string& v) + auto member = [&s] (const char* n, const string& v, const char* d = "") { - if (!v.empty ()) + if (v != d) s.member (n, v); }; @@ -641,7 +641,7 @@ namespace bpkg } s.end_object (); // os_release - member ("recursive", o.recursive ()); + member ("recursive", o.recursive (), "none"); if (o.private_ ()) s.member ("private", true); if (dependent_config) s.member ("dependent_config", true); -- cgit v1.1