From 4f5410dce665f2d5d693fc8e8509d5676ff52187 Mon Sep 17 00:00:00 2001
From: Mykola Golub <mgolub@suse.com>
Date: Sun, 7 Oct 2018 19:22:34 +0300
Subject: [PATCH] rbd: nicer help output for commands without options

Signed-off-by: Mykola Golub <mgolub@suse.com>
---
 src/test/cli/rbd/help.t        | 9 +++------
 src/tools/rbd/OptionPrinter.cc | 5 ++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index ec3f4116c5c..c4a0b37f3c6 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -306,8 +306,7 @@
     --image arg          image name
   
   rbd help config pool get
-  usage: rbd config pool get 
-                             <pool-name> <key> 
+  usage: rbd config pool get <pool-name> <key> 
   
   Get a pool-level configuration override.
   
@@ -329,8 +328,7 @@
     --pretty-format      pretty formatting (json and xml)
   
   rbd help config pool remove
-  usage: rbd config pool remove 
-                                <pool-name> <key> 
+  usage: rbd config pool remove <pool-name> <key> 
   
   Remove a pool-level configuration override.
   
@@ -339,8 +337,7 @@
     <key>                config key
   
   rbd help config pool set
-  usage: rbd config pool set 
-                             <pool-name> <key> <value> 
+  usage: rbd config pool set <pool-name> <key> <value> 
   
   Set a pool-level configuration override.
   
diff --git a/src/tools/rbd/OptionPrinter.cc b/src/tools/rbd/OptionPrinter.cc
index 1033b53be70..14affb0b3bb 100644
--- a/src/tools/rbd/OptionPrinter.cc
+++ b/src/tools/rbd/OptionPrinter.cc
@@ -37,7 +37,10 @@ void OptionPrinter::print_short(std::ostream &os, size_t initial_offset) {
     }
     indent_stream << " ";
   }
-  indent_stream << std::endl;
+
+  if (m_optional.options().size() > 0 || m_positional.options().size() == 0) {
+    indent_stream << std::endl;
+  }
 
   if (m_positional.options().size() > 0) {
     indent_stream.set_delimiter(" ");
-- 
2.47.3