diff options
Diffstat (limited to 'lib/puppet/ssl/host.rb')
| -rw-r--r-- | lib/puppet/ssl/host.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb index f367adaca..6d1ae1a16 100644 --- a/lib/puppet/ssl/host.rb +++ b/lib/puppet/ssl/host.rb @@ -85,7 +85,7 @@ class Puppet::SSL::Host # Specify how we expect to interact with our certificate authority. def self.ca_location=(mode) - raise ArgumentError, "CA Mode can only be %s" % CA_MODES.collect { |m| m.to_s }.join(", ") unless CA_MODES.include?(mode) + raise ArgumentError, "CA Mode can only be #{CA_MODES.collect { |m| m.to_s }.join(", ")}" unless CA_MODES.include?(mode) @ca_location = mode @@ -231,7 +231,7 @@ class Puppet::SSL::Host raise rescue Exception => detail puts detail.backtrace if Puppet[:trace] - Puppet.err "Could not request certificate: %s" % detail.to_s + Puppet.err "Could not request certificate: #{detail}" if time < 1 puts "Exiting; failed to retrieve certificate and waitforcert is disabled" exit(1) @@ -253,7 +253,7 @@ class Puppet::SSL::Host Puppet.notice "Did not receive certificate" rescue StandardError => detail puts detail.backtrace if Puppet[:trace] - Puppet.err "Could not request certificate: %s" % detail.to_s + Puppet.err "Could not request certificate: #{detail}" end end end |