From 6d6daae0506d35193d7032eaf87982bdb5b421f8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Fri, 11 Sep 2015 11:16:15 +0100
Subject: bottle: improve --keep-old error message.

---
 Library/Homebrew/cmd/bottle.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index e5bbdb44b..4400d8470 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -205,12 +205,12 @@ module Homebrew
 
     old_spec = f.bottle_specification
     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)
       end
-      if bad
+      if bad_fields.any?
         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
 
-- 
cgit v1.2.3