summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2011-03-25 16:25:09 -0700
committerJesse Wolfe <jes5199@gmail.com>2011-03-25 16:25:09 -0700
commit6985cc0f898d71dbd2ffbb353a2a482d9783cb42 (patch)
tree04aa795343486b7bb384836d2550dc9a6312ebe2 /lib/puppet/util
parentcc53969290512b15819fbd72021f342fee2f28f5 (diff)
parentdaaa048a8d8829ad509b4a456826cc8a33cf6444 (diff)
downloadpuppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.tar.gz
puppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.tar.xz
puppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.zip
Merge branch 'ticket/next/5477' into next
Diffstat (limited to 'lib/puppet/util')
-rwxr-xr-xlib/puppet/util/loadedfile.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/util/loadedfile.rb b/lib/puppet/util/loadedfile.rb
index 735dba459..d2f5d0923 100755
--- a/lib/puppet/util/loadedfile.rb
+++ b/lib/puppet/util/loadedfile.rb
@@ -34,10 +34,6 @@ module Puppet
# Create the file. Must be passed the file path.
def initialize(file)
@file = file
- unless FileTest.exists?(@file)
- raise Puppet::NoSuchFile,
- "Can not use a non-existent file for parsing"
- end
@statted = 0
@stamp = nil
@tstamp = stamp
@@ -50,7 +46,7 @@ module Puppet
@statted = Time.now.to_i
begin
@stamp = File.stat(@file).ctime
- rescue Errno::ENOENT
+ rescue Errno::ENOENT, Errno::ENOTDIR
@stamp = Time.now
end
end