From ab47a8a0306d79fd13d618fd13c26b3134053011 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 16 Jun 2016 10:07:26 -0400 Subject: [PATCH] Add "archive" as an alias for "archive-z2" I find the "-z2" is really a long ago relic of the past when I changed the format. We no longer have anything to do with the original `archive`, so let's start allowing people to type `--mode=archive` which just looks saner. At some point later I'll update the docs too, but it'll be an annoying transition period as we'll have to say "On older OSTree, use -z2" etc. Closes: #346 Approved by: giuseppe --- src/libostree/ostree-repo.c | 3 ++- tests/basic-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index c40abb78..5e3e31df 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1816,7 +1816,8 @@ ostree_repo_mode_from_string (const char *mode, ret_mode = OSTREE_REPO_MODE_BARE; else if (strcmp (mode, "bare-user") == 0) ret_mode = OSTREE_REPO_MODE_BARE_USER; - else if (strcmp (mode, "archive-z2") == 0) + else if (strcmp (mode, "archive-z2") == 0 || + strcmp (mode, "archive") == 0) ret_mode = OSTREE_REPO_MODE_ARCHIVE_Z2; else { diff --git a/tests/basic-test.sh b/tests/basic-test.sh index 0fe372dc..003df893 100755 --- a/tests/basic-test.sh +++ b/tests/basic-test.sh @@ -278,7 +278,7 @@ echo "ok prune" cd ${test_tmpdir} rm repo3 -rf -${CMD_PREFIX} ostree --repo=repo3 init --mode=archive-z2 +${CMD_PREFIX} ostree --repo=repo3 init --mode=archive ${CMD_PREFIX} ostree --repo=repo3 pull-local --remote=aremote repo test2 rm repo3/refs/remotes -rf mkdir repo3/refs/remotes @@ -405,7 +405,7 @@ echo "ok commit of fifo was rejected" cd ${test_tmpdir} rm repo2 -rf mkdir repo2 -${CMD_PREFIX} ostree --repo=repo2 init --mode=archive-z2 +${CMD_PREFIX} ostree --repo=repo2 init --mode=archive ${CMD_PREFIX} ostree --repo=repo2 pull-local repo rm -rf test2-checkout ${CMD_PREFIX} ostree --repo=repo2 checkout -U --disable-cache test2 test2-checkout