aboutsummaryrefslogtreecommitdiff
path: root/bpkg/pkg-bindist.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-09-19 13:13:05 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-09-19 13:13:05 +0200
commite3154f3b02a61eb51f84c0911396687cb62b333e (patch)
treebf3af4772a5017a445cb5d200af2f878df16bd00 /bpkg/pkg-bindist.cxx
parent6737797c36ad1657f32bd074c38f7948858051cc (diff)
Add `none` value to bpkg-pkg-bindist --recursive option
Diffstat (limited to 'bpkg/pkg-bindist.cxx')
-rw-r--r--bpkg/pkg-bindist.cxx8
1 files changed, 4 insertions, 4 deletions
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);