From e589cd39cc1d76de59cf4758bb986fa15f64571c Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 31 Aug 2009 23:23:57 -0700 Subject: Fixing #2582 - / no longer autorequires / This was obviously resulting in a dep cycle. Signed-off-by: Luke Kanies --- lib/puppet/type/file.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') 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 -- cgit