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

bottle: improve --keep-old error message for merge as well

Browse Source
This commit is contained in:
Xu Cheng 2015-09-11 18:36:40 +08:00
parent fe204fdf4b
commit 55616a4d01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,12 +273,12 @@ module Homebrew
old_spec = f.bottle_specification old_spec = f.bottle_specification
if keep_old && !old_spec.checksums.empty? if keep_old && !old_spec.checksums.empty?
bad = [:root_url, :prefix, :cellar, :revision].any? do |field| bad_fields = [:root_url, :prefix, :cellar, :revision].select do |field|
old_spec.send(field) != bottle.send(field) old_spec.send(field) != bottle.send(field)
end end
if bad if bad_fields.any?
ofail "--keep-old is passed but at least one of fields are not the same, skip it" ofail "--keep-old is passed but there are changes in: #{bad_fields.join ", "}"
next next
end end
end end