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

Merge pull request #2616 from HuijingHei/dup-osname 

Remove dup "--os=OSNAME" line in output of "ostree admin config-diff --help"
This commit is contained in:
Luca Bruno 2022-05-25 07:00:12 +00:00 committed by GitHub
parent ea0be27bd3 b024ce5eeb
commit cdfc2ff5bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ostree/ot-admin-builtin-deploy.c
View File

@ -87,22 +87,22 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat
} }
if (opt_kernel_proc_cmdline && opt_kernel_arg_none) if (opt_kernel_proc_cmdline && opt_kernel_arg_none)
{ {
ot_util_usage_error (context, "Can't specify both --karg-proc-cmdline and --karg-none", error); ot_util_usage_error (context, "Can't specify both --karg-proc-cmdline and --karg-none", error);
return FALSE; return FALSE;
} }
if (opt_kernel_arg_none && opt_kernel_argv_delete) if (opt_kernel_arg_none && opt_kernel_argv_delete)
{ {
ot_util_usage_error (context, "Can't specify both --karg-none and --karg-delete", error); ot_util_usage_error (context, "Can't specify both --karg-none and --karg-delete", error);
return FALSE; return FALSE;
} }
if (opt_no_merge && opt_kernel_argv_delete) if (opt_no_merge && opt_kernel_argv_delete)
{ {
ot_util_usage_error (context, "Can't specify both --no-merge and --karg-delete", error); ot_util_usage_error (context, "Can't specify both --no-merge and --karg-delete", error);
return FALSE; return FALSE;
} }
const char *refspec = argv[1]; const char *refspec = argv[1];

1
src/ostree/ot-admin-builtin-diff.c
View File

@ -39,7 +39,6 @@ gboolean
ot_admin_builtin_diff (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error) ot_admin_builtin_diff (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
{ {
g_autoptr(GOptionContext) context = g_option_context_new (""); g_autoptr(GOptionContext) context = g_option_context_new ("");
g_option_context_add_main_entries (context, options, NULL);
g_autoptr(OstreeSysroot) sysroot = NULL; g_autoptr(OstreeSysroot) sysroot = NULL;
if (!ostree_admin_option_context_parse (context, options, &argc, &argv, if (!ostree_admin_option_context_parse (context, options, &argc, &argv,