aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2013-09-01 12:59:01 +0100
committerMike McQuaid2013-09-01 12:59:01 +0100
commit98eac4226be22daa87fa912b49c1330495ab00d9 (patch)
treee94295b8e076e0341f0a8aca53f0797a874ab8b7 /Library/Homebrew
parentdd94518a409ca54fef1e08f4a0be894d53794636 (diff)
downloadbrew-98eac4226be22daa87fa912b49c1330495ab00d9.tar.bz2
Allow forcing bottle installation.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/bottles.rb1
-rw-r--r--Library/Homebrew/extend/ARGV.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index ab484c134..e067df471 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -17,6 +17,7 @@ def install_bottle? f, warn=false
and f.downloader.local_bottle_path
return false if ARGV.build_from_source?
+ return true if ARGV.force_bottle?
return false unless f.pour_bottle?
return false unless f.build.used_options.empty?
return false unless bottle_current?(f)
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 45d2f1168..5aa90dbb9 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -149,6 +149,10 @@ module HomebrewArgvExtension
end
end
+ def force_bottle?
+ include? '--force-bottle'
+ end
+
# eg. `foo -ns -i --bar` has three switches, n, s and i
def switch? switch_character
return false if switch_character.length > 1