summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2014-12-05 13:46:58 +0100
committerAlexander Larsson <alexl@redhat.com>2014-12-05 15:53:42 +0100
commit22ed7d0fbf357b640521f8557d28312145b2c84c (patch)
tree4a1a7cc1b43fbf3148c543d5d1fdec3bae31f463
parentbb82c17701ad36bd6a408a8212164d42f70f65fb (diff)
downloadostree-22ed7d0fbf357b640521f8557d28312145b2c84c.tar.gz
union checkout: Fix symlink handling for xattrs
Applying xattrs on a symlink during checkout failed since it was setting the xattrs on the final filename, not the temporary name. This made the "checkout union 1" test in test-basic.sh fail. https://bugzilla.gnome.org/show_bug.cgi?id=741125
-rw-r--r--src/libostree/ostree-repo-checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 29243d51..531fdf9e 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -271,7 +271,7 @@ checkout_file_unioning_from_input_at (OstreeRepoCheckoutMode mode,
if (xattrs)
{
- if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, destination_name,
+ if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, temp_filename,
xattrs, cancellable, error))
goto out;
}