diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 22 |
2 files changed, 15 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a35d33d9..306702160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## +- Bugfix: Parsing of `zen builds` `--log-progress` option fixed +## 5.7.3 - Feature: `zen builds download` and `zen builds ls` now allows multiple wildcards for `--wildcard` and `--exclude-wildcard` separated by semicolons (;) - Improvement: Gracefully handle missing chunks when exporting an oplog - Improvement: Add additional validations when reading disk cache records to get references in GC diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index c585c50c9..437b061c8 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -10777,22 +10777,26 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) { throw OptionParseException("'--verbose' conflicts with '--quiet'", SubOption->help()); } + if (m_LogProgress && m_PlainProgress) + { + throw OptionParseException("'--plain-progress' conflicts with '--log-progress'", SubOption->help()); + } + if (m_LogProgress && m_Quiet) + { + throw OptionParseException("'--quiet' conflicts with '--log-progress'", SubOption->help()); + } + if (m_PlainProgress && m_Quiet) + { + throw OptionParseException("'--quiet' conflicts with '--plain-progress'", SubOption->help()); + } IsVerbose = m_Verbose; IsQuiet = m_Quiet; if (m_LogProgress) { - if (IsQuiet) - { - throw OptionParseException("'--quiet' conflicts with '--log-progress'", SubOption->help()); - } ProgressMode = ProgressBar::Mode::Log; } - if (m_PlainProgress) + else if (m_PlainProgress) { - if (IsQuiet) - { - throw OptionParseException("'--quiet' conflicts with '--plain-progress'", SubOption->help()); - } ProgressMode = ProgressBar::Mode::Plain; } else if (m_Verbose) |