diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-12 22:50:34 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-12 22:50:34 +0800 |
| commit | 7954b95f5d4280498679d80cc5057a8b9b6b9822 (patch) | |
| tree | c18e26987278e1482dbd7ffe71109262ff252ee8 /env_universal_common.cpp | |
| parent | ebf91d59c7577e1c76b9e9e873e5d7f6f5ee3d3e (diff) | |
| parent | e752ac3035e6438303d79845637a4a2eaea4ff02 (diff) | |
Merge branch 'Integration_2.2.0'
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; } } |