[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 546130d929ce2f82cb074e440993749e74d1f8b4
Micah Anderson
micah at riseup.net
Mon Apr 14 02:30:39 UTC 2008
The following commit has been merged in the master branch:
commit 3a4e5c413ebacdc18c16bee55db412038105291b
Author: James Turnbull <james at lovedthanlost.net>
Date: Tue Apr 1 09:58:36 2008 +1100
Revert "Added updated fix for #1020"
This reverts commit 4f8df9803a9ad2f31d3e86418732a230b5cee3f3.
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index b555118..f6a5e8d 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -48,11 +48,7 @@ module Puppet::Network
Puppet.warning "Transient SSL write error; restarting connection and retrying"
self.recycle_connection
retry
- elsif detail.message =~ /certificate verify failed/ || /hostname was not match/ || /hostname not match/
- Puppet.warning "Certificate verification failed; consider using the certname configuration option"
- self.recycle_connection
- retry
- end
+ end
raise XMLRPCClientError,
"Certificates were not trusted: %s" % detail
rescue ::XMLRPC::FaultException => detail
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list