summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2005-07-26 19:05:07 +0000
committerLuke Kanies <luke@madstop.com>2005-07-26 19:05:07 +0000
commit01666f6654e9afb3edbdf16cff30ceccb1beca30 (patch)
tree8e6932d50a9fa348e1a6e8cac8e2c2e3a210c029
parent075ffd752de203823673d2a3846b7ff2d3dc16ec (diff)
downloadpuppet-01666f6654e9afb3edbdf16cff30ceccb1beca30.tar.gz
puppet-01666f6654e9afb3edbdf16cff30ceccb1beca30.tar.xz
puppet-01666f6654e9afb3edbdf16cff30ceccb1beca30.zip
fixing lib loading test
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@462 980ebf18-57e1-0310-9a29-db15c13687c0
-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 ]