diff options
| author | Xu Cheng | 2015-07-03 21:42:09 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-07-06 18:04:59 +0800 |
| commit | 4443a875243cabb0afaa862c846816b9e50fe60c (patch) | |
| tree | beddd7ab8fbca9f93ba7d1d0b31af598c17f9a73 /Library/Homebrew | |
| parent | 024c2d508b2af9246d68861663331fba80b50a06 (diff) | |
| download | brew-4443a875243cabb0afaa862c846816b9e50fe60c.tar.bz2 | |
stop setting root_url for offical taps' bottles
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 6d721b1aa..89e1f4f03 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -9,7 +9,7 @@ require 'extend/pathname' BOTTLE_ERB = <<-EOS bottle do - <% if root_url != BottleSpecification::DEFAULT_ROOT_URL %> + <% if !root_url.start_with?(BottleSpecification::DEFAULT_DOMAIN) %> root_url "<%= root_url %>" <% end %> <% if prefix != BottleSpecification::DEFAULT_PREFIX %> diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index e03a0191f..64b14efa3 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -486,9 +486,6 @@ module Homebrew if install_passed if formula.stable? && !ARGV.include?('--no-bottle') 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 } test "brew", "bottle", *bottle_args bottle_step = steps.last |