diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-03-25 16:10:03 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-03-25 16:10:03 -0700 |
| commit | a2ac367c2bea2b94b88f739250edb828da0091d4 (patch) | |
| tree | c8abe56ae0baf82ef51c5a27a3814bec42a8f890 /lib/puppet/util | |
| parent | 0fec21fcd887685cf8421fdc309b878088f9fc48 (diff) | |
| parent | 7c60db5d9db8eeda46f7041100759e69aed120a8 (diff) | |
| download | puppet-a2ac367c2bea2b94b88f739250edb828da0091d4.tar.gz puppet-a2ac367c2bea2b94b88f739250edb828da0091d4.tar.xz puppet-a2ac367c2bea2b94b88f739250edb828da0091d4.zip | |
Merge branch 'ticket/2.6.next/5477' into 2.6.next
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/loadedfile.rb | 6 |
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 |