Merge pull request #860 from MikeMcQuaid/bottle-keep-old-merge

bottle: allow --keep-old to ignore same sha256s.

1 files changed, 7 insertions, 3 deletions

diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 888e8c778..12071b907 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -391,10 +391,14 @@ module Homebrew
 
                 if !tag.empty?
                   if !bottle_hash["bottle"]["tags"][tag].to_s.empty?
-                    mismatches << "#{key} => #{tag}"
-                  else
-                    bottle.send(key, value => tag.to_sym)
+                    old_value = bottle_hash["bottle"]["tags"][tag][key].to_s
+                    if value != old_value
+                      mismatches << "#{key} => #{tag}"
+                    end
+                    next
                   end
+
+                  bottle.send(key, value => tag.to_sym)
                   next
                 end