diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-03-24 17:51:59 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-03-25 15:43:58 -0700 |
| commit | 7c60db5d9db8eeda46f7041100759e69aed120a8 (patch) | |
| tree | b1236106ed4fcd746c5ec8dee2f5028152eea93d /lib/puppet/util | |
| parent | 0f3e537a127ff0a55e25e0eea4b7513529867df3 (diff) | |
| download | puppet-7c60db5d9db8eeda46f7041100759e69aed120a8.tar.gz puppet-7c60db5d9db8eeda46f7041100759e69aed120a8.tar.xz puppet-7c60db5d9db8eeda46f7041100759e69aed120a8.zip | |
(#5477) Allow watch_file to watch non-existent files, especially site.pp
The watch_file mechanism would refuse to monitor paths to files that
didn't exist. This patch makes it possible to watch a file that hasn't
been created yet, so when it is created, you manifests will get
reparsed.
Backported this change to 2.6.x
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
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 |