shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-11 09:18:20 +03:00
Code Issues Projects Releases Wiki Activity

refs: Fix a logic error

Browse Source 
I encountered the Opening remotes/ dir error with some broken pull code, and this fixes it.

Closes: #358
Approved by: cgwalters
This commit is contained in:
Mathnerd314 2016-06-18 11:06:31 -06:00 committed by Atomic Bot
parent 23049bbd01
commit 9a779563bb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libostree/ostree-repo-refs.c
View File

@ -809,8 +809,10 @@ _ostree_repo_write_ref (OstreeRepo *self,
goto out; goto out;
} }
if (!glnx_opendirat (refs_remotes_dfd, remote, TRUE, &dfd, error)) dfd = glnx_opendirat_with_errno (refs_remotes_dfd, remote, TRUE);
if (dfd < 0 && (errno != ENOENT || rev != NULL))
{ {
glnx_set_error_from_errno (error);
g_prefix_error (error, "Opening remotes/ dir %s: ", remote); g_prefix_error (error, "Opening remotes/ dir %s: ", remote);
goto out; goto out;
} }
@ -818,13 +820,16 @@ _ostree_repo_write_ref (OstreeRepo *self,
if (rev == NULL) if (rev == NULL)
{ {
if (unlinkat (dfd, ref, 0) != 0) if (dfd >= 0)
{ {
if (errno != ENOENT) if (unlinkat (dfd, ref, 0) != 0)
{ {
glnx_set_error_from_errno (error); if (errno != ENOENT)
goto out; {
} glnx_set_error_from_errno (error);
goto out;
}
}
} }
} }
else else