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

bottle: allow forcing tap when not present.

Browse Source
This commit is contained in:
Mike McQuaid 2016-09-13 08:57:55 +01:00
parent c3a8701dc4
commit 4295936322
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -1,4 +1,4 @@
#: * `bottle` [`--verbose`] [`--no-rebuild`] [`--keep-old`] [`--skip-relocation`] [`--root-url=<root_url>`]: #: * `bottle` [`--verbose`] [`--no-rebuild`] [`--keep-old`] [`--skip-relocation`] [`--root-url=<root_url>`] [`--force-core-tap`]:
#: * `bottle` `--merge` [`--no-commit`] [`--keep-old`] [`--write`]: #: * `bottle` `--merge` [`--no-commit`] [`--keep-old`] [`--write`]:
#: #:
#: Generate a bottle (binary package) from a formula installed with #: Generate a bottle (binary package) from a formula installed with
@ -134,9 +134,15 @@ module Homebrew
return ofail "Formula not installed or up-to-date: #{f.full_name}" return ofail "Formula not installed or up-to-date: #{f.full_name}"
end end
unless f.tap tap = f.tap
unless tap
if ARGV.include?("--force-core-tap")
tap = CoreTap.instance
else
return ofail "Formula not from core or any taps: #{f.full_name}" return ofail "Formula not from core or any taps: #{f.full_name}"
end end
end
if f.bottle_disabled? if f.bottle_disabled?
ofail "Formula has disabled bottle: #{f.full_name}" ofail "Formula has disabled bottle: #{f.full_name}"
@ -152,7 +158,7 @@ module Homebrew
return ofail "Formula has no stable version: #{f.full_name}" return ofail "Formula has no stable version: #{f.full_name}"
end end
if ARGV.include? "--no-rebuild" if ARGV.include?("--no-rebuild") || !f.tap
rebuild = 0 rebuild = 0
elsif ARGV.include? "--keep-old" elsif ARGV.include? "--keep-old"
rebuild = f.bottle_specification.rebuild rebuild = f.bottle_specification.rebuild
@ -270,7 +276,7 @@ module Homebrew
root_url ||= ARGV.value("root_url") root_url ||= ARGV.value("root_url")
bottle = BottleSpecification.new bottle = BottleSpecification.new
bottle.tap = f.tap bottle.tap = tap
bottle.root_url(root_url) if root_url bottle.root_url(root_url) if root_url
if relocatable if relocatable
if skip_relocation if skip_relocation
@ -334,7 +340,7 @@ module Homebrew
}, },
"bintray" => { "bintray" => {
"package" => Utils::Bottles::Bintray.package(f.name), "package" => Utils::Bottles::Bintray.package(f.name),
"repository" => Utils::Bottles::Bintray.repository(f.tap), "repository" => Utils::Bottles::Bintray.repository(tap),
}, },
}, },
} }