Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 11 deletions

diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index b0585ba..7d46ee7 100644
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -17,19 +17,22 @@ static int help(const char *program_path, const char *service, const char *descr
         if (r < 0)
                 return log_oom();
 
-        printf("%s [OPTIONS...]\n\n"
-               "%s%s%s\n\n"
-               "This program takes no positional arguments.\n\n"
-               "%sOptions%s:\n"
+        printf("%1$s [OPTIONS...]\n"
+               "\n%5$s%7$s%6$s\n"
+               "\nThis program takes no positional arguments.\n"
+               "\n%3$sOptions:%4$s\n"
                "  -h --help                 Show this help\n"
                "     --version              Show package version\n"
-               "     --bus-introspect=PATH  Write D-Bus XML introspection data\n"
-               "\nSee the %s for details.\n"
-               , program_path
-               , ansi_highlight(), description, ansi_normal()
-               , ansi_underline(), ansi_normal()
-               , link
-        );
+               "%8$s"
+               "\nSee the %2$s for details.\n",
+               program_path,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal(),
+               description,
+               bus_introspect ? "     --bus-introspect=PATH  Write D-Bus XML introspection data\n" : "");
 
         return 0; /* No further action */
 }