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

utils/github: fix broken pipe error

Browse Source 
Closes #573.
This commit is contained in:
Martin Afanasjew 2016-07-25 07:53:12 +02:00
parent d4b5b2080d
commit bdc1991d77
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/utils/github.rb
View File

@ -52,11 +52,7 @@ module GitHub
elsif ENV["HOMEBREW_GITHUB_API_USERNAME"] && ENV["HOMEBREW_GITHUB_API_PASSWORD"] elsif ENV["HOMEBREW_GITHUB_API_USERNAME"] && ENV["HOMEBREW_GITHUB_API_PASSWORD"]
[ENV["HOMEBREW_GITHUB_API_USERNAME"], ENV["HOMEBREW_GITHUB_API_PASSWORD"]] [ENV["HOMEBREW_GITHUB_API_USERNAME"], ENV["HOMEBREW_GITHUB_API_PASSWORD"]]
else else
github_credentials = Utils.popen("git credential-osxkeychain get", "w+") do |io| github_credentials = api_credentials_from_keychain
io.puts "protocol=https\nhost=github.com"
io.close_write
io.read
end
github_username = github_credentials[/username=(.+)/, 1] github_username = github_credentials[/username=(.+)/, 1]
github_password = github_credentials[/password=(.+)/, 1] github_password = github_credentials[/password=(.+)/, 1]
if github_username && github_password if github_username && github_password
@ -68,6 +64,20 @@ module GitHub
end end
end end
def api_credentials_from_keychain
Utils.popen(["git", "credential-osxkeychain", "get"], "w+") do |pipe|
pipe.write "protocol=https\nhost=github.com\n"
pipe.close_write
pipe.read
end
rescue Errno::EPIPE
# The above invocation via `Utils.popen` can fail, causing the pipe to be
# prematurely closed (before we can write to it) and thus resulting in a
# broken pipe error. The root cause is usually a missing or malfunctioning
# `git-credential-osxkeychain` helper.
""
end
def api_credentials_type def api_credentials_type
token, username = api_credentials token, username = api_credentials
if token && !token.empty? if token && !token.empty?