From c080d8fefab3fd560907cc9d9fb693d9aba52b4e Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Wed, 8 Aug 2018 11:42:32 -0700 Subject: [PATCH] Fix Bottle::Filename.new for taps The file name of a bottle should not include the tap. --- Library/Homebrew/software_spec.rb | 2 +- Library/Homebrew/test/bottle_filename_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index b1ab746057..eedb10d283 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -252,7 +252,7 @@ class Bottle end def initialize(name, version, tag, rebuild) - @name = name + @name = File.basename name @version = version @tag = tag.to_s.gsub(/_or_later$/, "") @rebuild = rebuild diff --git a/Library/Homebrew/test/bottle_filename_spec.rb b/Library/Homebrew/test/bottle_filename_spec.rb index bf96319c6f..2bf2294698 100644 --- a/Library/Homebrew/test/bottle_filename_spec.rb +++ b/Library/Homebrew/test/bottle_filename_spec.rb @@ -4,7 +4,7 @@ require "software_spec" describe Bottle::Filename do subject { described_class.new(name, version, tag, rebuild) } - let(:name) { "foo" } + let(:name) { "user/repo/foo" } let(:version) { "1.0" } let(:tag) { :tag } let(:rebuild) { 0 }