From bcd40fb58338e44d46452c47c0ef150a96a5f829 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sat, 23 Aug 2008 18:36:03 -0500 Subject: Cleaning up an exception. Only adding option information when options are present. Signed-off-by: Luke Kanies --- lib/puppet/indirector/indirection.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/puppet') diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index a9fff75b8..e6068a6aa 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -262,7 +262,11 @@ class Puppet::Indirector::Indirection return unless terminus.respond_to?(:authorized?) unless terminus.authorized?(request) - raise ArgumentError, "Not authorized to call %s on %s with %s" % [request.method, request.key, request.options.inspect] + msg = "Not authorized to call %s on %s" % [request.method, request.key] + unless request.options.empty? + msg += " with %s" % request.options.inspect + end + raise ArgumentError, msg end end -- cgit