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

stop setting root_url for offical taps' bottles

Browse Source
This commit is contained in:
Xu Cheng 2015-07-03 21:42:09 +08:00
parent 024c2d508b
commit 4443a87524
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/bottle.rb
View File

@ -9,7 +9,7 @@ require 'extend/pathname'
BOTTLE_ERB = <<-EOS BOTTLE_ERB = <<-EOS
bottle do bottle do
<% if root_url != BottleSpecification::DEFAULT_ROOT_URL %> <% if !root_url.start_with?(BottleSpecification::DEFAULT_DOMAIN) %>
root_url "<%= root_url %>" root_url "<%= root_url %>"
<% end %> <% end %>
<% if prefix != BottleSpecification::DEFAULT_PREFIX %> <% if prefix != BottleSpecification::DEFAULT_PREFIX %>

3
Library/Homebrew/cmd/test-bot.rb
View File

@ -486,9 +486,6 @@ module Homebrew
if install_passed if install_passed
if formula.stable? && !ARGV.include?('--no-bottle') if formula.stable? && !ARGV.include?('--no-bottle')
bottle_args = ["--rb", canonical_formula_name] bottle_args = ["--rb", canonical_formula_name]
if @tap
bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
end
bottle_args << { :puts_output_on_success => true } bottle_args << { :puts_output_on_success => true }
test "brew", "bottle", *bottle_args test "brew", "bottle", *bottle_args
bottle_step = steps.last bottle_step = steps.last