diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-19 04:43:29 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-19 04:43:29 +0000 |
| commit | 973f9d05e8f7e722fc23e274c1be54ff8390abf0 (patch) | |
| tree | 4d477795db62772f77408b36c1f6c55fab95953a | |
| parent | cef41c26eaec80aeaf1e28c2224bfa764df4519e (diff) | |
| download | puppet-973f9d05e8f7e722fc23e274c1be54ff8390abf0.tar.gz puppet-973f9d05e8f7e722fc23e274c1be54ff8390abf0.tar.xz puppet-973f9d05e8f7e722fc23e274c1be54ff8390abf0.zip | |
Taking another crack at #504 -- I was using Pidlock incorrectly. I should have been using "locked?" but was using "lock".
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2309 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet/network/client/master.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 832cc4303..6ae7d55b3 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -315,7 +315,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client end ensure # Just make sure we remove the lock file if we set it. - lockfile.unlock if locked and lockfile.lock + lockfile.unlock if locked and lockfile.locked? end def running? |