From fe5dd077726e9d233386566228f41f55ef14b4d8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 19 Aug 2013 12:43:05 -0400 Subject: [PATCH] main: Drop --archive option from init, now that the code is removed Commit 1ec7c304086c14fe0540d9c371b66f64a7a81b2e removed archive mode, so this bit needs to be removed too. https://bugzilla.gnome.org/show_bug.cgi?id=706327 --- src/ostree/ot-builtin-init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c index 252b08ee..01421aef 100644 --- a/src/ostree/ot-builtin-init.c +++ b/src/ostree/ot-builtin-init.c @@ -26,11 +26,9 @@ #include "ostree.h" #include "libgsystem.h" -static gboolean opt_archive; static char *opt_mode = NULL; static GOptionEntry options[] = { - { "archive", 0, 0, G_OPTION_ARG_NONE, &opt_archive, "Initialize repository as archive", NULL }, { "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive-z2)", NULL }, { NULL } }; @@ -59,9 +57,7 @@ ostree_builtin_init (int argc, char **argv, GFile *repo_path, GCancellable *canc child = g_file_get_child (repo_path, "config"); config_data = g_string_new (DEFAULT_CONFIG_CONTENTS); - if (opt_archive) - mode_str = "archive"; - else if (opt_mode) + if (opt_mode) { OstreeRepoMode mode; if (!ostree_repo_mode_from_string (opt_mode, &mode, error))