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

Merge pull request #2143 from jlebon/pr/eacces-lock 

lib/repo: Handle EACCES for POSIX locking
This commit is contained in:
OpenShift Merge Robot 2020-07-01 17:05:40 -04:00 committed by GitHub
parent fd8ecdf047 1d755f62af
commit 1b770c5e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1933,7 +1933,7 @@ rename_pending_loose_objects (OstreeRepo *self,
return TRUE; return TRUE;
} }
/* Try to lock a transaction stage directory created by /* Try to lock and delete a transaction stage directory created by
* ostree_repo_prepare_transaction(). * ostree_repo_prepare_transaction().
*/ */
static gboolean static gboolean

4
src/libostree/ostree-repo.c
View File

@ -5980,7 +5980,9 @@ _ostree_repo_try_lock_tmpdir (int tmpdir_dfd,
if (!glnx_make_lock_file (tmpdir_dfd, lock_name, LOCK_EX | LOCK_NB, if (!glnx_make_lock_file (tmpdir_dfd, lock_name, LOCK_EX | LOCK_NB,
file_lock_out, &local_error)) file_lock_out, &local_error))
{ {
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) /* we need to handle EACCES too in the case of POSIX locks; see F_SETLK in fcntl(2) */
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)
|| g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED))
{ {
did_lock = FALSE; did_lock = FALSE;
} }