From 05d59fd02ff55e1f74dc7bb16a240ede74cebbc1 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sun, 10 Jul 2005 04:48:00 +0000 Subject: fixing a nasty bug related to recursion and nonexistent files git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@347 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/type/pfile.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index e8d459fe6..e5b657831 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -73,10 +73,18 @@ module Puppet sum = "" case @checktype when "md5": + if FileTest.directory?(self.parent[:path]) + Blink.verbose "Cannot MD5 sum directory %s" % + self.parent[:path] + end File.open(self.parent[:path]) { |file| sum = Digest::MD5.hexdigest(file.read) } when "md5lite": + if FileTest.directory?(self.parent[:path]) + Blink.verbose "Cannot MD5 sum directory %s" % + self.parent[:path] + end File.open(self.parent[:path]) { |file| sum = Digest::MD5.hexdigest(file.read(512)) } @@ -376,7 +384,8 @@ module Puppet @stat = nil # if recursion is enabled and we're a directory... - if @parameters[:recurse] and self.stat.directory? + if @parameters[:recurse] and FileTest.exist?(self[:path]) and + self.stat.directory? recurse = self[:recurse] # we might have a string, rather than a number if recurse.is_a?(String) -- cgit