diff options
| author | Luke Kanies <luke@madstop.com> | 2005-08-13 21:45:23 +0000 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2005-08-13 21:45:23 +0000 |
| commit | a3e03e221707d31d1ef6b3da1c609559f452d4d8 (patch) | |
| tree | 33ecc54887221559f6e122a48459defae95c3f64 /lib | |
| parent | d49a98e38cf94f3ca7295b87bf291a3b3f789b52 (diff) | |
| download | puppet-a3e03e221707d31d1ef6b3da1c609559f452d4d8.tar.gz puppet-a3e03e221707d31d1ef6b3da1c609559f452d4d8.tar.xz puppet-a3e03e221707d31d1ef6b3da1c609559f452d4d8.zip | |
all non-executable tests pass now
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@549 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/client.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb index 81e64d66f..39c3aa65b 100644 --- a/lib/puppet/client.rb +++ b/lib/puppet/client.rb @@ -41,7 +41,8 @@ module Puppet rescue XMLRPC::FaultException => detail Puppet.err "XML Could not call %s: %s" % [method, detail.faultString] - raise NetworkClientError.new(detail.to_s) + raise NetworkClientError.new, + "XMLRPC Error: %s" % detail.faultString rescue => detail Puppet.err "Could not call %s: %s" % [method, detail.inspect] raise NetworkClientError.new(detail.to_s) @@ -168,7 +169,7 @@ module Puppet end end if objects.is_a?(Puppet::TransBucket) - return self.config(objects) + @objects = objects else Puppet.warning objects.inspect raise NetworkClientError.new(objects.class) @@ -179,7 +180,10 @@ module Puppet # objects # for now, just descend into the tree and perform and necessary # manipulations - def config(tree) + def config + unless defined? @objects + raise Puppet::Error, "Cannot config; objects not defined" + end Puppet.debug("Calling config") # XXX this is kind of a problem; if the user changes the state file |