diff options
| -rw-r--r-- | lib/puppet/util/pidlock.rb | 2 | ||||
| -rw-r--r-- | test/util/pidlock.rb | 2 |
2 files changed, 3 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 } diff --git a/test/util/pidlock.rb b/test/util/pidlock.rb index 8dc7a56bf..671668d01 100644 --- a/test/util/pidlock.rb +++ b/test/util/pidlock.rb @@ -37,6 +37,8 @@ class TestPuppetUtilPidlock < Test::Unit::TestCase assert l.locked? assert l.mine? assert !l.anonymous? + # It's OK to call lock multiple times + assert l.lock assert l.unlock assert !l.locked? assert !l.mine? |