diff options
Diffstat (limited to 'src/zen/cmds/builds_cmd.cpp')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index 775c3d283..22e292f9c 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -1565,7 +1565,7 @@ BuildsDownloadSubCmd::BuildsDownloadSubCmd(BuildsConfiguration& Config) "", "build-part-name", "Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, " - "the part named 'default' is selected. Use '*' (alone) to select all parts.", + "only the 'default' part is downloaded. Use '*' (alone) to download all parts.", cxxopts::value(m_BuildPartNames), "<name>"); Opts.add_option("", @@ -1645,7 +1645,11 @@ BuildsDownloadSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/) std::vector<Oid> BuildPartIds = ParseBuildPartIds(m_BuildPartIds, Opts); std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts); - NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help()); + if (BuildPartIds.empty() && BuildPartNames.empty()) + { + BuildPartNames = {"default"}; + } + ValidatePartSelection(BuildPartIds, BuildPartNames, Opts.help()); EPartialBlockRequestMode PartialBlockRequestMode = ParseAllowPartialBlockRequests(Opts); @@ -1718,7 +1722,7 @@ BuildsLsSubCmd::BuildsLsSubCmd(BuildsConfiguration& Config) : BuildsSubCmdBase(C "", "build-part-name", "Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, " - "the part named 'default' is selected. Use '*' (alone) to select all parts.", + "all parts are listed. Use '*' (alone) to explicitly list all parts.", cxxopts::value(m_BuildPartNames), "<name>"); @@ -1767,7 +1771,7 @@ BuildsLsSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/) std::vector<Oid> BuildPartIds = ParseBuildPartIds(m_BuildPartIds, Opts); std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts); - NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help()); + ValidatePartSelection(BuildPartIds, BuildPartNames, Opts.help()); std::unique_ptr<CbObjectWriter> StructuredOutput; if (!m_ResultPath.empty()) @@ -1936,7 +1940,7 @@ BuildsPrimeCacheSubCmd::BuildsPrimeCacheSubCmd(BuildsConfiguration& Config) "", "build-part-name", "Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, " - "the part named 'default' is selected. Use '*' (alone) to select all parts.", + "only the 'default' part is primed. Use '*' (alone) to prime all parts.", cxxopts::value(m_BuildPartNames), "<name>"); Opts.add_option("", @@ -1972,7 +1976,11 @@ BuildsPrimeCacheSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/) std::vector<Oid> BuildPartIds = ParseBuildPartIds(m_BuildPartIds, Opts); std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts); - NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help()); + if (BuildPartIds.empty() && BuildPartNames.empty()) + { + BuildPartNames = {"default"}; + } + ValidatePartSelection(BuildPartIds, BuildPartNames, Opts.help()); std::uint64_t PreferredMultipartChunkSize = 32u * 1024u * 1024u; |