commit 6825c302dc892cb757d644055184defe3f3121b1 parent a85f8998b40626ac88dce5c5f32a8e9f538a983b Author: Chris Down <chris@chrisdown.name> Date: Tue, 20 Feb 2018 10:07:58 +0000 Revert "Remove CM_ONESHOT-specific logic in flock failure checks" This reverts commit 728d242d3c196a3fb2ed99c388581eab8edf3b6e. Diffstat:
M | clipmenud | | | 10 | ++++++++-- |
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/clipmenud b/clipmenud @@ -142,8 +142,14 @@ while true; do fi if ! flock -x -w "$lock_timeout" "$lock_fd"; then - printf 'ERROR: %s\n' 'Timed out waiting for lock' >&2 - exit 1 + if (( CM_ONESHOT )); then + printf 'ERROR: %s\n' 'Timed out waiting for lock' >&2 + exit 1 + else + printf 'ERROR: %s\n' \ + 'Timed out waiting for lock, skipping this run' >&2 + continue + fi fi for selection in "${cm_selections[@]}"; do