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

pull: stop printing warning on test-bot

Browse Source 
Closes Homebrew/homebrew#42097.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
Dominyk Tiller 2015-07-24 19:11:11 +01:00
parent 1845706187
commit a675aae553
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/pull.rb
View File

@ -99,7 +99,7 @@ module Homebrew
branch = `git symbolic-ref --short HEAD`.strip branch = `git symbolic-ref --short HEAD`.strip
unless branch == "master" unless branch == "master"
opoo "Current branch is #{branch}: do you need to pull inside master?" opoo "Current branch is #{branch}: do you need to pull inside master?" unless ARGV.include? "--clean"
end end
pull_url url pull_url url
@ -189,10 +189,11 @@ module Homebrew
"-u#{bintray_user}:#{bintray_key}", "-X", "POST", "-u#{bintray_user}:#{bintray_key}", "-X", "POST",
"-d", '{"publish_wait_for_secs": -1}', "-d", '{"publish_wait_for_secs": -1}',
"https://api.bintray.com/content/homebrew/#{repo}/#{package}/#{version}/publish" "https://api.bintray.com/content/homebrew/#{repo}/#{package}/#{version}/publish"
sleep 5
success = system "brew", "fetch", "--retry", "--force-bottle", f.full_name success = system "brew", "fetch", "--retry", "--force-bottle", f.full_name
unless success unless success
ohai "That didn't work; waiting for 15 seconds and trying again..." ohai "That didn't work; sleeping another 10 and trying again..."
sleep 15 sleep 10
system "brew", "fetch", "--retry", "--force-bottle", f.full_name system "brew", "fetch", "--retry", "--force-bottle", f.full_name
end end
end end