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 | |
| parent | ebf91d59c7577e1c76b9e9e873e5d7f6f5ee3d3e (diff) | |
| parent | e752ac3035e6438303d79845637a4a2eaea4ff02 (diff) | |
Merge branch 'Integration_2.2.0'
| -rw-r--r-- | env_universal_common.cpp | 5 | ||||
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | osx/config.h | 4 |
3 files changed, 7 insertions, 8 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; } } diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index dd4f7262..94b191ec 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1325,7 +1325,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1453,7 +1453,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1481,7 +1481,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; diff --git a/osx/config.h b/osx/config.h index 5a8e6b26..2d3ef3eb 100644 --- a/osx/config.h +++ b/osx/config.h @@ -222,7 +222,7 @@ #define PACKAGE_NAME "fish" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fish 2.2b1-git" +#define PACKAGE_STRING "fish 2.2.0-git" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "fish" @@ -231,7 +231,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.2b1-git" +#define PACKAGE_VERSION "2.2.0-git" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 |