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.
This commit is contained in:
Mike McQuaid 2016-11-05 16:13:42 -04:00
parent 3cef6a3a78
commit 1f6c26a2e4
2 changed files with 1 additions and 2 deletions

View File

@ -38,7 +38,6 @@ module Utils
# Allows a bottle tag to specify a specific OS or later, # Allows a bottle tag to specify a specific OS or later,
# so the same bottle can target multiple OSs. # so the same bottle can target multiple OSs.
# Not used in core, used in taps.
def find_or_later_tag(tag) def find_or_later_tag(tag)
begin begin
tag_version = MacOS::Version.from_symbol(tag) tag_version = MacOS::Version.from_symbol(tag)

View File

@ -221,7 +221,7 @@ class Bottle
def initialize(name, version, tag, rebuild) def initialize(name, version, tag, rebuild)
@name = name @name = name
@version = version @version = version
@tag = tag @tag = tag.to_s.gsub(/_or_later$/, "")
@rebuild = rebuild @rebuild = rebuild
end end