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_add | |
| 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_add')
| -rw-r--r-- | Functions/Calendar/calendar_add | 6 |
1 files changed, 4 insertions, 2 deletions
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 |