From 1f6c26a2e4b97ad90e6b8623df90daf4e07086a9 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 5 Nov 2016 16:13:42 -0400 Subject: [PATCH] software_spec: no `_or_later` in bottle filenames. It's more useful to be able to "bless" an existing bottle to be used on later OSs (e.g. where it cannot yet be built) than it is to have to create a new, identical bottle just to have a different filename. --- Library/Homebrew/extend/os/mac/utils/bottles.rb | 1 - Library/Homebrew/software_spec.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb index 0dd7341ea1..18312c9fa8 100644 --- a/Library/Homebrew/extend/os/mac/utils/bottles.rb +++ b/Library/Homebrew/extend/os/mac/utils/bottles.rb @@ -38,7 +38,6 @@ module Utils # Allows a bottle tag to specify a specific OS or later, # so the same bottle can target multiple OSs. - # Not used in core, used in taps. def find_or_later_tag(tag) begin tag_version = MacOS::Version.from_symbol(tag) diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index bb432e2dd5..f368c59b54 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -221,7 +221,7 @@ class Bottle def initialize(name, version, tag, rebuild) @name = name @version = version - @tag = tag + @tag = tag.to_s.gsub(/_or_later$/, "") @rebuild = rebuild end