diff options
| author | Colin Walters <walters@verbum.org> | 2017-09-21 15:48:46 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-21 22:17:55 +0000 |
| commit | ee5ecf33a55fb22ef121d76721dea0297d712c8f (patch) | |
| tree | 3fd57ed23e6973c4ceae36c4f9633f234019e97b /src/libostree/ostree-repo-checkout.c | |
| parent | 1797aff6a86770621d3ea9e0f725ad96754876b5 (diff) | |
| download | ostree-ee5ecf33a55fb22ef121d76721dea0297d712c8f.tar.gz | |
lib: Define an alias OSTREE_REPO_MODE_ARCHIVE
For the old `OSTREE_REPO_MODE_ARCHIVE_Z2`. Use it mostly tree
wide except for the repo finder tests (to avoid conflicting with
some outstanding PRs).
Just noted another user coming in some of those tests and wanted to do a
cleanup.
Closes: #1209
Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-repo-checkout.c')
| -rw-r--r-- | src/libostree/ostree-repo-checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index fd1153ac..a3dd6887 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -536,7 +536,7 @@ checkout_one_file_at (OstreeRepo *repo, (repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER); gboolean current_can_cache = (options->enable_uncompressed_cache && current_repo->enable_uncompressed_cache); - gboolean is_archive_z2_with_cache = (current_repo->mode == OSTREE_REPO_MODE_ARCHIVE_Z2 + gboolean is_archive_z2_with_cache = (current_repo->mode == OSTREE_REPO_MODE_ARCHIVE && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER && current_can_cache); @@ -608,7 +608,7 @@ checkout_one_file_at (OstreeRepo *repo, && !is_whiteout && !is_symlink && need_copy - && repo->mode == OSTREE_REPO_MODE_ARCHIVE_Z2 + && repo->mode == OSTREE_REPO_MODE_ARCHIVE && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER) { HardlinkResult hardlink_res = HARDLINK_RESULT_NOT_SUPPORTED; |