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

bottle: improve --keep-old error message.

Browse Source
This commit is contained in:
Mike McQuaid 2015-09-11 11:16:15 +01:00
parent b1ff9c42d6
commit 6d6daae050
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

@ -205,12 +205,12 @@ module Homebrew
old_spec = f.bottle_specification old_spec = f.bottle_specification
if ARGV.include?("--keep-old") && !old_spec.checksums.empty? if ARGV.include?("--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?
bottle_path.unlink if bottle_path.exist? bottle_path.unlink if bottle_path.exist?
odie "--keep-old is passed but at least one of fields are not the same" odie "--keep-old is passed but there are changes in: #{bad_fields.join ", "}"
end end
end end