aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-09-03 20:20:52 +0100
committerMike McQuaid2016-09-03 20:20:52 +0100
commitec1437499a178a09805854469c5162d749270f3e (patch)
treeb2cbaa71456f193936e2fbd22199d69f2bf9de5b /Library
parent9fd97dd3cf26b6644a9f808945869b2af44db26e (diff)
downloadbrew-ec1437499a178a09805854469c5162d749270f3e.tar.bz2
bottle: allow --keep-old to ignore same sha256s.
It should refuse to change existing ones but it should allow them to be the same and silently ignore.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/bottle.rb10
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