summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2014-09-23 15:31:30 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2014-09-25 03:08:06 -0400
commit1dca5566911a59276242c5e1cc8ea4a611853879 (patch)
tree972566c51ee4f6ddd687e7b3704f5c3b5b93d9b0
parent40f490ed11febb72182b125c67a86b5f634211b6 (diff)
downloadostree-1dca5566911a59276242c5e1cc8ea4a611853879.tar.gz
Pass --help to the most nested subcommand
'ostree admin <x> --help' and 'ostree admin instutil <x> --help' should give help on the deepest subcommand, not on 'ostree admin'. https://bugzilla.gnome.org/show_bug.cgi?id=737194
-rw-r--r--src/ostree/ot-admin-builtin-instutil.c2
-rw-r--r--src/ostree/ot-builtin-admin.c2
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");