diff options
| author | Xu Cheng | 2015-09-11 18:36:40 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-09-11 18:36:40 +0800 |
| commit | 55616a4d019b22b6c3224966e5049240dee9fb62 (patch) | |
| tree | 15da4e8784a31291476063e0cc5dc02b76582460 /Library/Homebrew/cmd | |
| parent | fe204fdf4b5e7c10f88cf19e099b5bbedd67c600 (diff) | |
| download | brew-55616a4d019b22b6c3224966e5049240dee9fb62.tar.bz2 | |
bottle: improve --keep-old error message for merge as well
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 653d403aa..156860b50 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 |
