summaryrefslogtreecommitdiffstats
path: root/lib/puppet/indirector/face.rb
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-07-22 15:24:16 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-07-22 16:27:20 -0700
commit88e9cd2138e9f23e056bd3331498a6d4723a8b0c (patch)
treee797119561bcb890ec199aadabf0582e16d076bd /lib/puppet/indirector/face.rb
parent82e5fa9561e2d4cb1d699a41c14f50953d8f2d97 (diff)
downloadpuppet-88e9cd2138e9f23e056bd3331498a6d4723a8b0c.tar.gz
puppet-88e9cd2138e9f23e056bd3331498a6d4723a8b0c.tar.xz
puppet-88e9cd2138e9f23e056bd3331498a6d4723a8b0c.zip
maint: don't print inside action implementations.
Rather than printing directly, we should return the data from the Action and allow the facade to route that to the user directly. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
Diffstat (limited to 'lib/puppet/indirector/face.rb')
-rw-r--r--lib/puppet/indirector/face.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/indirector/face.rb b/lib/puppet/indirector/face.rb
index ead3f4b46..b4cac5c51 100644
--- a/lib/puppet/indirector/face.rb
+++ b/lib/puppet/indirector/face.rb
@@ -86,11 +86,11 @@ class Puppet::Indirector::Face < Puppet::Face
run mode with the '--mode' option.
EOT
- when_invoked do |*args|
+ when_invoked do |options|
if t = indirection.terminus_class
- puts "Run mode '#{Puppet.run_mode.name}': #{t}"
+ "Run mode '#{Puppet.run_mode.name}': #{t}"
else
- $stderr.puts "No default terminus class for run mode '#{Puppet.run_mode.name}'"
+ "No default terminus class for run mode '#{Puppet.run_mode.name}'"
end
end
end