diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-16 03:54:18 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-16 03:54:18 +0000 |
| commit | dad596e6c5e241607eee92e54890b53affeba02b (patch) | |
| tree | cacf10af8e832f5d3b7248dd6437465e6e23e317 /lib/puppet/client | |
| parent | 9a8636c3c22ca5b7d244e1a80e9c2bf8b4dffe8f (diff) | |
| download | puppet-dad596e6c5e241607eee92e54890b53affeba02b.tar.gz puppet-dad596e6c5e241607eee92e54890b53affeba02b.tar.xz puppet-dad596e6c5e241607eee92e54890b53affeba02b.zip | |
Fixing #291 -- the problem was that instead of throwing an error on a missing server, puppet was just exiting.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1785 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
| -rw-r--r-- | lib/puppet/client/master.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index 0763cdfe1..97d224065 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -168,8 +168,8 @@ class Puppet::Client::MasterClient < Puppet::Client Puppet::Type.allclear end - # Disable running the configuration. This can be used from the command line, but - # is also used to make sure only one client is running at a time. + # Disable running the configuration. This can be used from the command + # line, but is also used to make sure only one client is running at a time. def disable(running = false) threadlock(:puppetd) do text = nil |