diff options
| author | Luke Kanies <luke@madstop.com> | 2009-08-31 23:23:57 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-09-01 21:06:07 +1000 |
| commit | e589cd39cc1d76de59cf4758bb986fa15f64571c (patch) | |
| tree | cb889cc886fc45a5837dc9161291cfe215fe5e88 /lib | |
| parent | 3342b73b6acf5e7c492fa352b16ba9aba3c60da8 (diff) | |
| download | puppet-e589cd39cc1d76de59cf4758bb986fa15f64571c.tar.gz puppet-e589cd39cc1d76de59cf4758bb986fa15f64571c.tar.xz puppet-e589cd39cc1d76de59cf4758bb986fa15f64571c.zip | |
Fixing #2582 - / no longer autorequires /
This was obviously resulting in a dep cycle.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type/file.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index f62af871e..34dc4454e 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -237,10 +237,10 @@ module Puppet # Autorequire any parent directories. autorequire(:file) do - if self[:path] - File.dirname(self[:path]) + basedir = File.dirname(self[:path]) + if basedir != self[:path] + basedir else - Puppet.err "no path for %s, somehow; cannot setup autorequires" % self.ref nil end end |