Inline method so we don't merge and unpack options twice

1 files changed, 2 insertions, 6 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 278dc656e..e9ee8c5da 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -5,7 +5,8 @@ require 'bottle_version'
 
 def bottle_filename options={}
   options = { :tag => bottle_tag }.merge(options)
-  "#{options[:name]}-#{options[:version]}#{bottle_native_suffix(options)}"
+  suffix = ".#{options[:tag]}#{bottle_suffix(options[:revision])}"
+  "#{options[:name]}-#{options[:version]}#{suffix}"
 end
 
 def built_as_bottle? f
@@ -24,11 +25,6 @@ def bottle_file_outdated? f, file
   bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext
 end
 
-def bottle_native_suffix options={}
-  options = { :tag => bottle_tag }.merge(options)
-  ".#{options[:tag]}#{bottle_suffix(options[:revision])}"
-end
-
 def bottle_suffix revision=nil
   revision = revision.to_i > 0 ? ".#{revision}" : ""
   ".bottle#{revision}.tar.gz"