diff options
author | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-03 15:31:03 +0800 |
---|---|---|
committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-03 15:31:03 +0800 |
commit | e60db8075ca81be9ddbff4d3a3577bcafab51658 (patch) | |
tree | 038b60624552329d94171d64f2aeccf6853f08e3 /env_universal_common.cpp | |
parent | 322a6118720b060638dbb72481ea0c996fb9334e (diff) |
Open universal variable lock file read/write and ignore errors
Closes #2149.
Diffstat (limited to 'env_universal_common.cpp')
-rw-r--r-- | env_universal_common.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/env_universal_common.cpp b/env_universal_common.cpp index f90cc82b..b493de21 100644 --- a/env_universal_common.cpp +++ b/env_universal_common.cpp @@ -698,7 +698,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) */ int result_fd = -1; bool needs_lock = true; - int flags = O_RDONLY | O_CREAT; + int flags = O_RDWR | O_CREAT; #ifdef O_EXLOCK flags |= O_EXLOCK; needs_lock = false; @@ -741,8 +741,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) /* error */ if (errno != EINTR) { - int err = errno; - report_error(err, L"Unable to lock universal variable file '%ls'", path.c_str()); + /* Do nothing per #2149 */ break; } } |