packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: Fix bare-user symlink checkouts 

Logic error introduced after refactoring; we hoisted the
`is_bare_user_symlink` variable to the top, but its computation
below.  But the `is_bare` symlink depended on it.

Closes: https://github.com/ostreedev/ostree/issues/798

Closes: #799
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-04-18 10:13:45 -04:00 committed by Atomic Bot
parent b9df96db8b
commit 08964d595d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo-checkout.c
View File

@ -479,7 +479,6 @@ checkout_one_file_at (OstreeRepo *repo,
(current_repo->mode == OSTREE_REPO_MODE_BARE (current_repo->mode == OSTREE_REPO_MODE_BARE
&& options->mode == OSTREE_REPO_CHECKOUT_MODE_NONE) || && options->mode == OSTREE_REPO_CHECKOUT_MODE_NONE) ||
(repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER); (repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER);
gboolean is_bare = is_hardlinkable && !is_bare_user_symlink;
gboolean current_can_cache = (options->enable_uncompressed_cache gboolean current_can_cache = (options->enable_uncompressed_cache
&& current_repo->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_Z2
@ -491,6 +490,7 @@ checkout_one_file_at (OstreeRepo *repo,
* as well as write_object(). * as well as write_object().
*/ */
is_bare_user_symlink = (repo_is_usermode && is_symlink); is_bare_user_symlink = (repo_is_usermode && is_symlink);
const gboolean is_bare = is_hardlinkable && !is_bare_user_symlink;
/* Verify if no_copy_fallback is set that we can hardlink, with a /* Verify if no_copy_fallback is set that we can hardlink, with a
* special exception for bare-user symlinks. * special exception for bare-user symlinks.

1
tests/basic-test.sh
View File

@ -44,6 +44,7 @@ validate_checkout_basic() {
assert_has_file baz/cow assert_has_file baz/cow
assert_file_has_content baz/cow moo assert_file_has_content baz/cow moo
assert_has_file baz/deeper/ohyeah assert_has_file baz/deeper/ohyeah
assert_symlink_has_content somelink nosuchfile
) )
} }