fixed option alignment issues

3 files changed, 5 insertions, 4 deletions

diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 44c6c5a44..9b28d9bd5 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -80,7 +80,6 @@ def main():
             mode.bcore.shutdown()
     else:
         log.error("Unknown mode %s" % setup['args'][0])
-        print("Usage:\n     %s" % setup.buildHelpMessage())
         print(create_description())
         raise SystemExit(1)
 
diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt
index 7f79c8ec2..17f90ca27 100755
--- a/src/sbin/bcfg2-crypt
+++ b/src/sbin/bcfg2-crypt
@@ -242,7 +242,7 @@ def main():
     optinfo.update(Bcfg2.Options.CRYPT_OPTIONS)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     setup = Bcfg2.Options.OptionParser(optinfo)
-    setup.hm = "Usage: bcfg2-crypt [options] <filename>\nOptions:\n     %s" % \
+    setup.hm = "     bcfg2-crypt [options] <filename>\nOptions:\n%s" % \
         setup.buildHelpMessage()
     setup.parse(sys.argv[1:])
 
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 37e9d4371..5303aa02b 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -631,8 +631,10 @@ if __name__ == '__main__':
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
     setup = Bcfg2.Options.OptionParser(optinfo)
-    setup.hm = "Usage:\n     %s\n%s" % (setup.buildHelpMessage(),
-                                        USAGE)
+    setup.hm = "\n".join(["     bcfg2-info [options] [command <command args>]",
+                          "Options:",
+                          setup.buildHelpMessage(),
+                          USAGE])
 
     setup.parse(sys.argv[1:])
     if setup['args'] and setup['args'][0] == 'help':