about summary refs log tree commit diff
path: root/Functions/Calendar/calendar_sort
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-04-13 16:28:21 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-04-13 16:28:21 +0000
commitc30b038a422cb918f5a80115ef9c1541cedf3dea (patch)
tree8000b872bbd2a7650f23b7ffe4cbf5550e45ed76 /Functions/Calendar/calendar_sort
parent1094863b35d48a93de5cc20bc65121a2712db2d2 (diff)
downloadzsh-c30b038a422cb918f5a80115ef9c1541cedf3dea.tar.gz
zsh-c30b038a422cb918f5a80115ef9c1541cedf3dea.tar.xz
zsh-c30b038a422cb918f5a80115ef9c1541cedf3dea.zip
unposted: calendar system updates:
allow file locking to fall back; don't need dcop for kdialog
Diffstat (limited to 'Functions/Calendar/calendar_sort')
-rw-r--r--Functions/Calendar/calendar_sort6
1 files changed, 4 insertions, 2 deletions
diff --git a/Functions/Calendar/calendar_sort b/Functions/Calendar/calendar_sort
index 4911e34a2..0eddd12c7 100644
--- a/Functions/Calendar/calendar_sort
+++ b/Functions/Calendar/calendar_sort
@@ -16,8 +16,10 @@ zstyle -s ':datetime:calendar:' calendar-file calendar || calendar=~/calendar
 # start of block for following always to clear up lockfiles.
 # Not needed but harmless if OS file locking is used.
 {
-  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; then
+    # locked OK
+    :
   else
     calendar_lockfiles $calendar || exit 1
   fi