diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-30 13:00:56 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-30 13:00:56 -0700 |
| commit | 9d17809e5b240aa80d2c30f4d9625d4812802b8f (patch) | |
| tree | f2c9101dbf36c9fcbf51454c9baca9a7d92cb667 /lib/puppet/util | |
| parent | 76b3ee6822f52b100c45cd8921f13739f12ddf38 (diff) | |
| parent | f5170fc2dbcbb4202b9b08e8944aa35f7a7bf7b8 (diff) | |
| download | puppet-9d17809e5b240aa80d2c30f4d9625d4812802b8f.tar.gz puppet-9d17809e5b240aa80d2c30f4d9625d4812802b8f.tar.xz puppet-9d17809e5b240aa80d2c30f4d9625d4812802b8f.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next: (23 commits)
(#5908) Add support for new update-rc.d disable API
(#6862) Add a default subject for the mail_patches rake task
Fixed #6256 - Creation of rrd directory.
(#5477) Allow watch_file to watch non-existent files, especially site.pp
(#5221) Add test for fix to fileset with trailing separator
(#5221) Fix fileset path absoluteness checking with trailing slash
(#4769) Fix negative timeout support for newer rubies
Fixed #6562 - Minor kick documentation fix
(#6658) Propagate ENC connection errors to the agent
(#4884) Remove typo from spec test
(#4884) Modify tests to pass on non-OS X systems
(#4884) Revise new exec tests, add a few more
(4576) - if ENC declares invalid class, it is logged at warning.
(#4884) Add an shell provider for execs
(#4884) Fix Test::Unit exec tests
(#4884) Break the exec type out to have a posix provider
(#4884) Add consistent path validation and behavior
(#4884) Add expand_path to requiring the spec_helper
(#4884) Autorequire shared behaviors and method to silence warnings
(#4884) Fix whitespace
...
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetrun | 1 | ||||
| -rwxr-xr-x | lib/puppet/util/loadedfile.rb | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/puppet/util/command_line/puppetrun b/lib/puppet/util/command_line/puppetrun index 7eba3b2c4..3437405b0 100755 --- a/lib/puppet/util/command_line/puppetrun +++ b/lib/puppet/util/command_line/puppetrun @@ -107,7 +107,6 @@ # option requires LDAP support at this point. # # ping:: -# # Do a ICMP echo against the target host. Skip hosts that don't respond to ping. # # = Example 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 |