summaryrefslogtreecommitdiffstats
path: root/lib/puppet/daemon.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-12 18:08:39 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-12 18:08:39 +0000
commit96388cbd3b1a88a978e176b30b52d7753b70236b (patch)
tree7c32629142ad31524a279d92db3fd310fb94832d /lib/puppet/daemon.rb
parent2be25d51f38f53c92bcc6b9688344fdb1c06f48f (diff)
downloadpuppet-96388cbd3b1a88a978e176b30b52d7753b70236b.tar.gz
puppet-96388cbd3b1a88a978e176b30b52d7753b70236b.tar.xz
puppet-96388cbd3b1a88a978e176b30b52d7753b70236b.zip
Fixing locking. It apparently was not working on OS X, and I was not syncronizing access in threads -- i assumed locks themselves were a sufficient sync point.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@897 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/daemon.rb')
-rwxr-xr-xlib/puppet/daemon.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index fcedff3d7..9f91e183f 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -221,7 +221,8 @@ module Puppet
begin
File.unlink(@pidfile)
rescue => detail
- Puppet.err "Could not remove PID file %s: %s" % [@pidfile, detail]
+ Puppet.err "Could not remove PID file %s: %s" %
+ [@pidfile, detail]
end
end