diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-25 18:28:26 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-25 18:28:26 -0500 |
| commit | 9d2f45df3d951ef59a44a7fb81a38586f04884b4 (patch) | |
| tree | 0c97adcca32ba9ad2e20b2457f3db0c4b91f8376 /lib/puppet/network/client.rb | |
| parent | 0afea69c06742eff1e8d8bd7df13c9c0e4c397c0 (diff) | |
| parent | 04892ee723d1a687c83eb6c99b5c6a6c76bbcbc9 (diff) | |
| download | puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.tar.gz puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.tar.xz puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.zip | |
Merge branch '0.24.x'
Diffstat (limited to 'lib/puppet/network/client.rb')
| -rw-r--r-- | lib/puppet/network/client.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index 283436e95..0a0a72345 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -95,9 +95,7 @@ class Puppet::Network::Client # We have to start the HTTP connection manually before we start # sending it requests or keep-alive won't work. - if @driver.respond_to? :start - @driver.start - end + @driver.start if @driver.respond_to? :start @local = false elsif hash.include?(driverparam) @@ -107,8 +105,7 @@ class Puppet::Network::Client end @local = true else - raise Puppet::Network::ClientError, "%s must be passed a Server or %s" % - [self.class, driverparam] + raise Puppet::Network::ClientError, "%s must be passed a Server or %s" % [self.class, driverparam] end end |