admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
bottle: allow --keep-old to ignore same sha256s.
This commit is contained in:
Mike McQuaid 2016-09-04 10:58:07 +01:00 committed by GitHub
commit 52812006b5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/bottle.rb
View File

@ -391,13 +391,17 @@ module Homebrew
if !tag.empty? if !tag.empty?
if !bottle_hash["bottle"]["tags"][tag].to_s.empty? if !bottle_hash["bottle"]["tags"][tag].to_s.empty?
old_value = bottle_hash["bottle"]["tags"][tag][key].to_s
if value != old_value
mismatches << "#{key} => #{tag}" mismatches << "#{key} => #{tag}"
else
bottle.send(key, value => tag.to_sym)
end end
next next
end end
bottle.send(key, value => tag.to_sym)
next
end
old_value = bottle_hash["bottle"][key].to_s old_value = bottle_hash["bottle"][key].to_s
next if key == "cellar" && old_value == "any" && value == "any_skip_relocation" next if key == "cellar" && old_value == "any" && value == "any_skip_relocation"
mismatches << key if old_value.empty? || value != old_value mismatches << key if old_value.empty? || value != old_value