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

checkout: Save errno when re-throwing 

I was seeing an `EPERM`  here which was confusing.
It turned out the real error was `EEXIST`.

Since we're referring to the original error, but we do a
lot of computation in the middle, we need to save errno.
This commit is contained in:
Colin Walters 2021-08-26 15:16:37 -04:00
parent 28a0792919
commit 87d115706e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,6 +481,7 @@ checkout_file_hardlink (OstreeRepo *self,
} }
else if (errno == EEXIST) else if (errno == EEXIST)
{ {
int saved_errno = errno;
/* When we get EEXIST, we need to handle the different overwrite modes. */ /* When we get EEXIST, we need to handle the different overwrite modes. */
switch (options->overwrite_mode) switch (options->overwrite_mode)
{ {
@ -566,6 +567,7 @@ checkout_file_hardlink (OstreeRepo *self,
else else
{ {
g_assert_cmpint (options->overwrite_mode, ==, OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL); g_assert_cmpint (options->overwrite_mode, ==, OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL);
errno = saved_errno;
return glnx_throw_errno_prefix (error, "Hardlinking %s to %s", loose_path, destination_name); return glnx_throw_errno_prefix (error, "Hardlinking %s to %s", loose_path, destination_name);
} }
break; break;