summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/client.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index 1e3b0f4a2..e4dd00801 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -13,20 +13,23 @@ require 'puppet/transaction'
require 'puppet/transportable'
require 'puppet/metric'
+$noclientnetworking = false
begin
require 'webrick'
require 'cgi'
require 'xmlrpc/client'
require 'xmlrpc/server'
rescue LoadError => detail
- $nonetworking = detail
+ $noclientnetworking = detail
end
module Puppet
class NetworkClientError < RuntimeError; end
class ClientError < RuntimeError; end
#---------------------------------------------------------------
- unless $nonetworking
+ if $noclientnetworking
+ Puppet.err "Could not load client network libs: %s" % $noclientnetworking
+ else
class NetworkClient < XMLRPC::Client
@@methods = [ :getconfig ]