From 1dca5566911a59276242c5e1cc8ea4a611853879 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 23 Sep 2014 15:31:30 -0400 Subject: [PATCH] Pass --help to the most nested subcommand 'ostree admin --help' and 'ostree admin instutil --help' should give help on the deepest subcommand, not on 'ostree admin'. https://bugzilla.gnome.org/show_bug.cgi?id=737194 --- src/ostree/ot-admin-builtin-instutil.c | 2 +- src/ostree/ot-builtin-admin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c index 66ea80ed..9e571200 100644 --- a/src/ostree/ot-admin-builtin-instutil.c +++ b/src/ostree/ot-admin-builtin-instutil.c @@ -117,7 +117,7 @@ ot_admin_builtin_instutil (int argc, char **argv, OstreeSysroot *sysroot, GCance argc = out; - if (subcommand_name == NULL || want_help) + if (subcommand_name == NULL) { subcommand = admin_instutil_subcommands; g_print ("usage: ostree admin instutil COMMAND [options]\n"); diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c index 6db97ca4..533f15f9 100644 --- a/src/ostree/ot-builtin-admin.c +++ b/src/ostree/ot-builtin-admin.c @@ -145,7 +145,7 @@ ostree_builtin_admin (int argc, char **argv, OstreeRepo *repo, GCancellable *can argc = out; - if (subcommand_name == NULL || want_help) + if (subcommand_name == NULL) { subcommand = admin_subcommands; g_print ("usage: ostree admin --sysroot=PATH COMMAND [options]\n");