diff options
| author | Ben Hughes <ben@puppetlabs.com> | 2011-06-03 11:29:15 -0700 |
|---|---|---|
| committer | Ben Hughes <ben@puppetlabs.com> | 2011-06-03 11:29:15 -0700 |
| commit | 9660f5e12f10eb20cb2c2beb7d66b931919b0019 (patch) | |
| tree | 4d7cc9701ad4a8ad7a2bf60f4433334bbcccb246 | |
| parent | 805b2878d0b23d76917f5210abe35489f6f84c74 (diff) | |
| parent | 16b2311256a142a69cb9ddadf29eea804b281e1c (diff) | |
| download | puppet-9660f5e12f10eb20cb2c2beb7d66b931919b0019.tar.gz puppet-9660f5e12f10eb20cb2c2beb7d66b931919b0019.tar.xz puppet-9660f5e12f10eb20cb2c2beb7d66b931919b0019.zip | |
Merge branch 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-to-return-a-value' into 2.6.x
| -rw-r--r-- | lib/puppet/application/agent.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/application/agent_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index 0d67c1a88..cf51f0825 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -98,7 +98,7 @@ class Puppet::Application::Agent < Puppet::Application unless fingerprint = cert.fingerprint(options[:digest]) raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'" end - Puppet.notice fingerprint + puts fingerprint end def onetime diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb index de6c7c893..de90869c4 100755 --- a/spec/unit/application/agent_spec.rb +++ b/spec/unit/application/agent_spec.rb @@ -570,7 +570,7 @@ describe Puppet::Application::Agent do @host.stubs(:certificate).returns(@cert) @cert.stubs(:fingerprint).with(:MD5).returns("DIGEST") - Puppet.expects(:notice).with("DIGEST") + @puppetd.expects(:puts).with "DIGEST" @puppetd.fingerprint end |