diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-04-13 16:28:21 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-04-13 16:28:21 +0000 |
| commit | c30b038a422cb918f5a80115ef9c1541cedf3dea (patch) | |
| tree | 8000b872bbd2a7650f23b7ffe4cbf5550e45ed76 /Functions/Calendar/calendar | |
| parent | 1094863b35d48a93de5cc20bc65121a2712db2d2 (diff) | |
| download | zsh-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')
| -rw-r--r-- | Functions/Calendar/calendar | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Functions/Calendar/calendar b/Functions/Calendar/calendar index bbfa9ffb0..e4cdff8e4 100644 --- a/Functions/Calendar/calendar +++ b/Functions/Calendar/calendar @@ -266,9 +266,11 @@ chmod 600 $mycmds # Attempt to lock both $donefile and $calendar. # Don't lock $newfile; we've tried our best to make # the name unique. - if zmodload -F zsh/system b:zsystem && zsystem supports flock; then - zsystem flock $calendar - zsystem flock $donefile + if zmodload -F zsh/system b:zsystem && zsystem supports flock && + zsystem flock $calendar 2>/dev/null && + zsystem flock $donefile 2>/dev/null; then + # locked OK + : else calendar_lockfiles $calendar $donefile || exit 1 fi |