diff options
| author | Mike McQuaid | 2017-10-27 16:19:05 +0100 |
|---|---|---|
| committer | GitHub | 2017-10-27 16:19:05 +0100 |
| commit | b2e2e4b917805b8cf0a86bbc4a1517146a1f0d33 (patch) | |
| tree | f867db81150943cb43b1f9852ed997dc97de5f6e /Library/Homebrew | |
| parent | 4209275a5884c3f12046cde107546447b3c00319 (diff) | |
| parent | b93ed4124c8dd9299b19f3fb82d1489dd30eb31a (diff) | |
| download | brew-b2e2e4b917805b8cf0a86bbc4a1517146a1f0d33.tar.bz2 | |
Merge pull request #3381 from iMichka/flock
lock.sh: suppress error output when looking for flock
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/utils/lock.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/utils/lock.sh b/Library/Homebrew/utils/lock.sh index 7f2bb8b73..e7fe348aa 100644 --- a/Library/Homebrew/utils/lock.sh +++ b/Library/Homebrew/utils/lock.sh @@ -45,7 +45,7 @@ _create_lock() { if [[ -x "$ruby" ]] && "$ruby" -e "exit(RUBY_VERSION >= '1.8.7')" then "$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" - elif [[ -x "$(which flock)" ]] + elif [[ -x "$(which flock 2>/dev/null)" ]] then flock -n "$lock_fd" elif [[ -x "$python" ]] |