diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/puppet/daemon.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index 661c25947..bd02a9dc3 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -239,7 +239,10 @@ module Puppet # Remove the pid file def rmpidfile threadlock(:pidfile) do - Puppet::Util::Pidlock.new(pidfile).unlock or Puppet.err "Could not remove PID file %s" % [pidfile] + locker = Puppet::Util::Pidlock.new(pidfile) + if locker.locked? + locker.unlock or Puppet.err "Could not remove PID file %s" % [pidfile] + end end end |