From: Matthew Leeds Date: Fri, 28 Sep 2018 01:29:30 +0000 (-0700) Subject: lib/repo: Fix minor mistake in locking docs X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~19^2~28 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7892d35c0b192ad16d07dee93cec88d7294f9b63;p=ostree.git lib/repo: Fix minor mistake in locking docs The config option is "lock-timeout-secs" not "lock-timeout". Closes: #1737 Approved by: jlebon --- diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 19f715aa..73ee027c 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -454,9 +454,9 @@ pop_repo_lock (OstreeRepo *self, * state is not changed and the stack is simply updated. * * ostree_repo_lock_push() waits for the lock depending on the repository's - * lock-timeout configuration. When lock-timeout is -1, a blocking lock is + * lock-timeout-secs configuration. When lock-timeout-secs is -1, a blocking lock is * attempted. Otherwise, the lock is taken non-blocking and - * ostree_repo_lock_push() will sleep synchronously up to lock-timeout seconds + * ostree_repo_lock_push() will sleep synchronously up to lock-timeout-secs seconds * attempting to acquire the lock. If the lock cannot be acquired within the * timeout, a %G_IO_ERROR_WOULD_BLOCK error is returned. * @@ -544,9 +544,9 @@ _ostree_repo_lock_push (OstreeRepo *self, * lock. * * ostree_repo_lock_pop() waits for the lock depending on the repository's - * lock-timeout configuration. When lock-timeout is -1, a blocking lock is + * lock-timeout-secs configuration. When lock-timeout-secs is -1, a blocking lock is * attempted. Otherwise, the lock is removed non-blocking and - * ostree_repo_lock_pop() will sleep synchronously up to lock-timeout seconds + * ostree_repo_lock_pop() will sleep synchronously up to lock-timeout-secs seconds * attempting to remove the lock. If the lock cannot be removed within the * timeout, a %G_IO_ERROR_WOULD_BLOCK error is returned. *