From 79f9896d2ffd03819236318c9f0742d40f1826ac Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Mon, 2 Jan 2017 16:05:14 +0000
Subject: bottles: --force-bottle feigns or_later.

When reproducing issues with software that hasn’t been bottled yet on
your version of macOS it can sometimes be helpful to use `or_later`
bottle functionality i.e. just use the bottle for the latest version of
macOS available. This maps well to the existing `--force-bottle`
argument so it will now act as if the latest bottle has a `or_later`
ending.
---
 Library/Homebrew/cmd/fetch.rb                   | 5 +++--
 Library/Homebrew/cmd/install.rb                 | 8 ++++----
 Library/Homebrew/extend/os/mac/utils/bottles.rb | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index f92ef03b2..820a27e31 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -18,8 +18,9 @@
 #:    If `--build-from-source` is passed, download the source rather than a
 #:    bottle.
 #:
-#:    If `--force-bottle` is passed, download a bottle if it exists for the current
-#:    version of macOS, even if it would not be used during installation.
+#:    If `--force-bottle` is passed, download a bottle if it exists for the
+#:    current or newest version of macOS, even if it would not be used during
+#:    installation.
 
 require "formula"
 
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 700cd9c3d..6f578caf6 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -32,10 +32,10 @@
 #:    passed, then both <formula> and the dependencies installed as part of this process
 #:    are built from source even if bottles are available.
 #:
-#     Hidden developer option:
-#     If `--force-bottle` is passed, install from a bottle if it exists
-#    for the current version of macOS, even if custom options are given.
-#
+#:    If `--force-bottle` is passed, install from a bottle if it exists for the
+#:    current or newest version of macOS, even if it would not normally be used
+#:    for installation.
+#:
 #:    If `--devel` is passed, and <formula> defines it, install the development version.
 #:
 #:    If `--HEAD` is passed, and <formula> defines it, install the HEAD version,
diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb
index 18312c9fa..c54e4e5b7 100644
--- a/Library/Homebrew/extend/os/mac/utils/bottles.rb
+++ b/Library/Homebrew/extend/os/mac/utils/bottles.rb
@@ -49,6 +49,8 @@ module Utils
           if key.to_s.end_with?("_or_later")
             later_tag = key.to_s[/(\w+)_or_later$/, 1].to_sym
             MacOS::Version.from_symbol(later_tag) <= tag_version
+          elsif ARGV.force_bottle?
+            true
           end
         end
       end
-- 
cgit v1.2.3