From c30b038a422cb918f5a80115ef9c1541cedf3dea Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Tue, 13 Apr 2010 16:28:21 +0000
Subject: unposted: calendar system updates: allow file locking to fall back;
 don't need dcop for kdialog

---
 Functions/Calendar/calendar_add | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Functions/Calendar/calendar_add')

diff --git a/Functions/Calendar/calendar_add b/Functions/Calendar/calendar_add
index ac5caecd7..eded25b2a 100644
--- a/Functions/Calendar/calendar_add
+++ b/Functions/Calendar/calendar_add
@@ -74,8 +74,10 @@ fi
 # Not needed but harmless if OS file locking is used.
 {
   if (( ! nolock )); then
-    if zmodload -F zsh/system b:zsystem && zsystem supports flock; then
-      zsystem flock $calendar
+    if zmodload -F zsh/system b:zsystem && zsystem supports flock &&
+      zsystem flock $calendar 2>/dev/null; then
+      # locked OK
+      :
     else
       calendar_lockfiles $calendar || exit 1
     fi
-- 
cgit 1.4.1