summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/file_locking.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/util/file_locking.rb b/lib/puppet/util/file_locking.rb
index 101ece308..f1f02be1c 100644
--- a/lib/puppet/util/file_locking.rb
+++ b/lib/puppet/util/file_locking.rb
@@ -5,6 +5,7 @@ module Puppet::Util::FileLocking
# Create a shared lock for reading
def readlock(file)
+ raise ArgumentError, "%s is not a file" % file unless !File.exists?(file) or File.file?(file)
Puppet::Util.sync(file).synchronize(Sync::SH) do
File.open(file) { |f|
f.lock_shared { |lf| yield lf }
@@ -18,6 +19,7 @@ module Puppet::Util::FileLocking
unless FileTest.directory?(File.dirname(file))
raise Puppet::DevError, "Cannot create %s; directory %s does not exist" % [file, File.dirname(file)]
end
+ raise ArgumentError, "%s is not a file" % file unless !File.exists?(file) or File.file?(file)
tmpfile = file + ".tmp"
unless mode