admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #2624 from mistydemeo/use_python_flock

Browse Source 
Use Python's flock instead of Ruby's
This commit is contained in:
Misty De Meo 2017-05-25 11:48:15 -07:00 committed by GitHub
commit fb33acbbe4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/utils/lock.sh
View File

@ -38,14 +38,19 @@ _create_lock() {
local lock_fd="$1" local lock_fd="$1"
local name="$2" local name="$2"
local ruby="/usr/bin/ruby" local ruby="/usr/bin/ruby"
local python="/usr/bin/python"
[[ -x "$ruby" ]] || ruby="$(which ruby 2>/dev/null)" [[ -x "$ruby" ]] || ruby="$(which ruby 2>/dev/null)"
[[ -x "$python" ]] || python="$(which python 2>/dev/null)"
if [[ -n "$ruby" ]] if [[ -x "$ruby" ]] && "$ruby" -e "exit(RUBY_VERSION >= '1.8.7')"
then then
"$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" "$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)"
elif [[ -n "$(which flock)" ]] elif [[ -x "$(which flock)" ]]
then then
flock -n "$lock_fd" flock -n "$lock_fd"
elif [[ -x "$python" ]]
then
"$python" -c "import fcntl; fcntl.flock($lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)"
else else
onoe "Cannot create $name lock, please avoid running Homebrew in parallel." onoe "Cannot create $name lock, please avoid running Homebrew in parallel."
fi fi