summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/pidlock.rb
diff options
context:
space:
mode:
authormpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-31 04:31:53 +0000
committermpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-31 04:31:53 +0000
commite4843f1e5bf177577252a06598c5e84940e719ef (patch)
tree8234155257bf0a4d6b230c012b48fcf9f966094f /lib/puppet/util/pidlock.rb
parente2525058b69fc07d4cb336b15f9a8afbd9e718b5 (diff)
downloadpuppet-e4843f1e5bf177577252a06598c5e84940e719ef.tar.gz
puppet-e4843f1e5bf177577252a06598c5e84940e719ef.tar.xz
puppet-e4843f1e5bf177577252a06598c5e84940e719ef.zip
Make Pidlock#lock return true if we currently hold the lock
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2001 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/util/pidlock.rb')
-rw-r--r--lib/puppet/util/pidlock.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/pidlock.rb b/lib/puppet/util/pidlock.rb
index be7e1dbca..fae8134a5 100644
--- a/lib/puppet/util/pidlock.rb
+++ b/lib/puppet/util/pidlock.rb
@@ -25,7 +25,7 @@ class Puppet::Util::Pidlock
opts = {:anonymous => false}.merge(opts)
if locked?
- false
+ mine?
else
if opts[:anonymous]
File.open(@lockfile, 'w') { |fd| true }