diff options
| author | Colin Walters <walters@verbum.org> | 2017-09-01 16:15:33 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-01 20:54:12 +0000 |
| commit | 88b25dc65c5e2392a732c157cf43fa3dfac5e191 (patch) | |
| tree | ed75877fd19b73fe4a1345033aff554917009858 /src/ostree | |
| parent | f07432d4cefcea7fb8c602b9ab78e83236127d8f (diff) | |
| download | ostree-88b25dc65c5e2392a732c157cf43fa3dfac5e191.tar.gz | |
tree-wide: Replace archive-z2 with archive
In almost all places. There are just a few exceptions; one tricky bit for
example is that the repo config must still have `mode=archive-z2`, since
`archive` used to mean something else. (We could very likely just get rid of
that check, but eh, later).
I also added a test that one can still do `ostree repo init --mode=archive-z2`.
Closes: #1125
Approved by: jlebon
Diffstat (limited to 'src/ostree')
| -rw-r--r-- | src/ostree/ot-builtin-commit.c | 2 | ||||
| -rw-r--r-- | src/ostree/ot-builtin-init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index f07b95e2..3b9e3630 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -780,7 +780,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError if (!ostree_repo_commit_transaction (repo, &stats, cancellable, error)) goto out; - /* The default for this option is FALSE, even for archive-z2 repos, + /* The default for this option is FALSE, even for archive repos, * because ostree supports multiple processes committing to the same * repo (but different refs) concurrently, and in fact gnome-continuous * actually does this. In that context it's best to update the summary diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c index 28f96829..c77f6972 100644 --- a/src/ostree/ot-builtin-init.c +++ b/src/ostree/ot-builtin-init.c @@ -37,7 +37,7 @@ static char *opt_collection_id = NULL; */ static GOptionEntry options[] = { - { "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive-z2)", NULL }, + { "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive)", NULL }, #ifdef OSTREE_ENABLE_EXPERIMENTAL_API { "collection-id", 0, 0, G_OPTION_ARG_STRING, &opt_collection_id, "Globally unique ID for this repository as an collection of refs for redistribution to other repositories", "COLLECTION-ID" }, |