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

bottle: allow --keep-old to ignore same sha256s.
2016-09-04 10:58:07 +01:00 · 2016-09-04 10:58:07 +01:00 · 52812006b5
commit 52812006b5
parent 9fd97dd3cf ec1437499a
1 changed files with 7 additions and 3 deletions
--- 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