Add a --version argument that also outputs features

And use it in the tests to skip libarchive tests when the build
doesn't support it.
This commit is contained in:
Colin Walters committed 2013-05-01 19:15:06 -04:00
1 parent b1ace57ef8
commit 82f444020e
4 files changed
+32

No files matched your search

+21
View File
@@ -29,6 +29,13 @@
#include "ot-main.h"
#include "otutil.h"
static gboolean opt_version;
static GOptionEntry main_options[] = {
{ "version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Display version", NULL },
{ NULL }
};
int
ostree_usage (char **argv,
OstreeCommand *commands,
@@ -80,6 +87,7 @@ ostree_run (int argc,
OstreeCommand *commands,
GError **res_error)
{
GOptionContext *optcontext;
OstreeCommand *command;
GError *error = NULL;
int cmd_argc;
@@ -104,6 +112,19 @@ ostree_run (int argc,
if (argc < 2)
return ostree_usage (argv, commands, TRUE);
optcontext = g_option_context_new ("COMMAND [OPTIONS...]");
g_option_context_add_main_entries (optcontext, main_options, NULL);
g_option_context_set_ignore_unknown_options (optcontext, TRUE);
if (!g_option_context_parse (optcontext, &argc, &argv, &error))
goto out;
if (opt_version)
{
g_print ("%s\n %s\n", PACKAGE_STRING, OSTREE_FEATURES);
return 0;
}
have_repo_arg = g_str_has_prefix (argv[1], "--repo=");
if (have_repo_arg)