diff options
| author | Mike McQuaid | 2016-11-06 08:20:27 -0500 |
|---|---|---|
| committer | GitHub | 2016-11-06 08:20:27 -0500 |
| commit | 77a6878779e671f97de84f7ee40de05f7288c807 (patch) | |
| tree | 59c6494e70fbe97edebca9005711ff7dfac74782 /Library/Homebrew | |
| parent | bc67414b9ad9eb5dac64a9c8344b647beda99e14 (diff) | |
| parent | 1f6c26a2e4b97ad90e6b8623df90daf4e07086a9 (diff) | |
| download | brew-77a6878779e671f97de84f7ee40de05f7288c807.tar.bz2 | |
Merge pull request #1446 from MikeMcQuaid/or_later_bottles_filename
software_spec: no `_or_later` in bottle filenames.
Diffstat (limited to 'Library/Homebrew')
| -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 |