From 973f9d05e8f7e722fc23e274c1be54ff8390abf0 Mon Sep 17 00:00:00 2001 From: luke Date: Mon, 19 Mar 2007 04:43:29 +0000 Subject: 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 --- lib/puppet/network/client/master.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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? -- cgit