From 9d72ff2d8e72deef9cf9322e76a0d192c653f2d4 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 23 Sep 2014 15:33:13 -0400 Subject: [PATCH] Fix help output for nested subcommands Only 'ostree admin' was appearing in the help message for commands nested within 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, 4 insertions(+) diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c index 9e571200..c87ffa4e 100644 --- a/src/ostree/ot-admin-builtin-instutil.c +++ b/src/ostree/ot-admin-builtin-instutil.c @@ -151,6 +151,8 @@ ot_admin_builtin_instutil (int argc, char **argv, OstreeSysroot *sysroot, GCance goto out; } + g_set_prgname (g_strdup_printf ("ostree admin instutil %s", subcommand_name)); + if (!subcommand->fn (argc, argv, sysroot, cancellable, error)) goto out; diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c index 533f15f9..ef54797e 100644 --- a/src/ostree/ot-builtin-admin.c +++ b/src/ostree/ot-builtin-admin.c @@ -179,6 +179,8 @@ ostree_builtin_admin (int argc, char **argv, OstreeRepo *repo, GCancellable *can goto out; } + g_set_prgname (g_strdup_printf ("ostree admin %s", subcommand_name)); + sysroot_path = g_file_new_for_path (opt_sysroot); sysroot = ostree_sysroot_new (sysroot_path); if (!subcommand->fn (argc, argv, sysroot, cancellable, error))