From 55616a4d019b22b6c3224966e5049240dee9fb62 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 11 Sep 2015 18:36:40 +0800 Subject: [PATCH] bottle: improve --keep-old error message for merge as well --- Library/Homebrew/cmd/bottle.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 653d403aa9..156860b506 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -273,12 +273,12 @@ module Homebrew old_spec = f.bottle_specification 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) end - if bad - ofail "--keep-old is passed but at least one of fields are not the same, skip it" + if bad_fields.any? + ofail "--keep-old is passed but there are changes in: #{bad_fields.join ", "}" next end end