diff options
| author | Mike McQuaid | 2016-11-05 16:13:42 -0400 |
|---|---|---|
| committer | Mike McQuaid | 2016-11-05 16:13:42 -0400 |
| commit | 1f6c26a2e4b97ad90e6b8623df90daf4e07086a9 (patch) | |
| tree | fcbdbfbed341ca8fac189513873cc5cae1aa0c94 /Library | |
| parent | 3cef6a3a78fb9d300b6d7db4cf9a389c1af4ce8b (diff) | |
| download | brew-1f6c26a2e4b97ad90e6b8623df90daf4e07086a9.tar.bz2 | |
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.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/utils/bottles.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/software_spec.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb index 0dd7341ea..18312c9fa 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 bb432e2dd..f368c59b5 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 |