summaryrefslogtreecommitdiff
path: root/lib/chef/exceptions.rb
diff options
context:
space:
mode:
authorsawanoboly <sawanoboriyu@higanworks.com>2015-09-23 17:34:06 +0900
committerLamont Granquist <lamont@scriptkiddie.org>2015-10-24 20:25:11 -0700
commiteed2c5a4d5f18bc0c41e4e4b8ba469a2148412e1 (patch)
tree977fe5e88e7085b956feda4dbf93f66e8584e4d7 /lib/chef/exceptions.rb
parent219e84f17be85ca1a14986e63b087856748263ef (diff)
downloadchef-eed2c5a4d5f18bc0c41e4e4b8ba469a2148412e1.tar.gz
follow comment of #3900
Diffstat (limited to 'lib/chef/exceptions.rb')
-rw-r--r--lib/chef/exceptions.rb6
1 files changed, 5 insertions, 1 deletions
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