From eed2c5a4d5f18bc0c41e4e4b8ba469a2148412e1 Mon Sep 17 00:00:00 2001
From: sawanoboly <sawanoboriyu@higanworks.com>
Date: Wed, 23 Sep 2015 17:34:06 +0900
Subject: follow comment of #3900

---
 lib/chef/exceptions.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/chef/exceptions.rb')

diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index 2d60faa0c9..855c86d9cc 100644
--- a/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
@@ -74,7 +74,11 @@ class Chef
     class InvalidPrivateKey < ArgumentError; end
     class MissingKeyAttribute < ArgumentError; end
     class KeyCommandInputError < ArgumentError; end
-    class BootstrapCommandInputError < ArgumentError; end
+    class BootstrapCommandInputError < ArgumentError
+      def initialize
+        super "You cannot pass both --json-attributes and --json-attribute-file. Please pass one or none."
+      end
+    end
     class InvalidKeyArgument < ArgumentError; end
     class InvalidKeyAttribute < ArgumentError; end
     class InvalidUserAttribute < ArgumentError; end
-- 
cgit v1.2.1