From dfe4e7641a71aef693831134c8db406e3252fa88 Mon Sep 17 00:00:00 2001
From: Martin Schimandl
Date: Sun, 8 Oct 2017 09:59:29 +0200
Subject: combine errors to a single if-statement. fix spec test

---
 Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Library/Homebrew/cask/lib')

diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
index 05d939a4b..4f8569444 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
@@ -71,16 +71,16 @@ module Hbc
             next
           end
 
-          if value.nil? || (value.is_a?(Array) && value.empty?)
-            opoo "no such stanza '#{stanza}' on Cask '#{cask}'" unless quiet?
-            puts ""
-            raise ArgumentError, "no such stanza '#{stanza}' on Cask '#{cask}'"
-          end
+          if (value.nil? || value.is_a?(Array) && value.empty?) ||
+             (artifact_name && !value.key?(artifact_name))
 
-          if artifact_name && !value.key?(artifact_name)
-            opoo "no such stanza '#{artifact_name}' on Cask '#{cask}'" unless quiet?
-            puts ""
-            raise ArgumentError, "no such stanza '#{artifact_name}' on Cask '#{cask}'"
+            if artifact_name
+              thing = artifact_name
+            else
+              thing = stanza
+            end
+
+            raise CaskError, "no such stanza '#{thing}' on Cask '#{cask}'"
           end
 
           if stanza == :artifacts
-- 
cgit v1.2.3