diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index e358a1d55..6db2e98c7 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -483,11 +483,11 @@ class Puppet::Network::Client::Master < Puppet::Network::Client end def self.timeout - @timeout = Puppet[:configtimeout] - case @timeout + timeout = Puppet[:configtimeout] + case timeout when String: - if @timeout =~ /^\d+$/ - @timeout = Integer(@timeout) + if timeout =~ /^\d+$/ + timeout = Integer(timeout) else raise ArgumentError, "Configuration timeout must be an integer" end @@ -495,6 +495,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client else raise ArgumentError, "Configuration timeout must be an integer" end + + return timeout end # Send off the transaction report. |