packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/admin: Don't load sysroot for root commands 

There's no need to load the sysroot for root commands which have
subcommands, like `ostree admin` and `ostree admin instutil`. Otherwise,
even just calling them without arguments will cause a failure. The
subcommands will have the appropriate flags set as needed.

Closes: #1126
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-09-08 15:40:59 -04:00 committed by Atomic Bot
parent 225bbdf002
commit 4c02fc2daa
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ostree/ot-admin-builtin-instutil.c
View File

@ -106,7 +106,7 @@ ot_admin_builtin_instutil (int argc, char **argv, GCancellable *cancellable, GEr
/* This will not return for some options (e.g. --version). */ /* This will not return for some options (e.g. --version). */
if (ostree_admin_option_context_parse (context, NULL, &argc, &argv, if (ostree_admin_option_context_parse (context, NULL, &argc, &argv,
OSTREE_ADMIN_BUILTIN_FLAG_UNLOCKED, OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT,
NULL, cancellable, error)) NULL, cancellable, error))
{ {
if (subcommand_name == NULL) if (subcommand_name == NULL)

2
src/ostree/ot-builtin-admin.c
View File

@ -126,7 +126,7 @@ ostree_builtin_admin (int argc, char **argv, GCancellable *cancellable, GError *
/* This will not return for some options (e.g. --version). */ /* This will not return for some options (e.g. --version). */
if (ostree_admin_option_context_parse (context, NULL, &argc, &argv, if (ostree_admin_option_context_parse (context, NULL, &argc, &argv,
OSTREE_ADMIN_BUILTIN_FLAG_NONE | OSTREE_ADMIN_BUILTIN_FLAG_UNLOCKED, OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT,
NULL, cancellable, error)) NULL, cancellable, error))
{ {
if (subcommand_name == NULL) if (subcommand_name == NULL)

5
src/ostree/ot-main.c
View File

@ -374,10 +374,11 @@ ostree_admin_option_context_parse (GOptionContext *context,
g_option_context_add_main_entries (context, global_admin_entries, NULL); g_option_context_add_main_entries (context, global_admin_entries, NULL);
if (!ostree_option_context_parse (context, main_entries, argc, argv, OSTREE_BUILTIN_FLAG_NO_REPO, NULL, cancellable, error)) if (!ostree_option_context_parse (context, main_entries, argc, argv,
OSTREE_BUILTIN_FLAG_NO_REPO, NULL, cancellable, error))
return FALSE; return FALSE;
if (flags & OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT) if (!opt_print_current_dir && (flags & OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT))
{ {
g_assert_null (out_sysroot); g_assert_null (out_sysroot);
/* Early return if no sysroot is requested */ /* Early return if no sysroot is requested */