summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-10-08 22:27:12 -0500
committerLuke Kanies <luke@madstop.com>2008-10-08 22:32:56 -0500
commitb0c01dac2270b3107a07fd504f1c41f592e8f790 (patch)
treee1b0d09107aa976ea4d14b85e2c0ec7b6f8a9908 /lib/puppet
parentaea55823db21088f2dc19f99f857b12332b6c208 (diff)
downloadpuppet-b0c01dac2270b3107a07fd504f1c41f592e8f790.tar.gz
puppet-b0c01dac2270b3107a07fd504f1c41f592e8f790.tar.xz
puppet-b0c01dac2270b3107a07fd504f1c41f592e8f790.zip
Adding an additional option for the fix in ff36832e, skipping missing cert dirs
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/sslcertificates/support.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/sslcertificates/support.rb b/lib/puppet/sslcertificates/support.rb
index d95944adc..5ca06721d 100644
--- a/lib/puppet/sslcertificates/support.rb
+++ b/lib/puppet/sslcertificates/support.rb
@@ -133,6 +133,9 @@ module Puppet::SSLCertificates::Support
#return nil unless FileTest.directory?(dir)
raise ArgumentError, "Tried to fix SSL files to a file containing uppercase" unless short.downcase == short
+
+ return false unless File.directory?(dir)
+
real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
other.downcase == short
end