I couldn't get this to fail in a targeted regression test,
but if it's not working, it causes a failure in the webrick
tests.
Signed-off-by: Luke Kanies <[EMAIL PROTECTED]>
---
lib/puppet/sslcertificates/support.rb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/puppet/sslcertificates/support.rb
b/lib/puppet/sslcertificates/support.rb
index bab250d..d95944a 100644
--- a/lib/puppet/sslcertificates/support.rb
+++ b/lib/puppet/sslcertificates/support.rb
@@ -28,7 +28,6 @@ module Puppet::SSLCertificates::Support
# Define the reading method.
define_method(reader) do
- p Puppet[param]
return nil unless FileTest.exists?(Puppet[param]) or
rename_files_with_uppercase(Puppet[param])
begin
@@ -129,6 +128,10 @@ module Puppet::SSLCertificates::Support
def rename_files_with_uppercase(file)
dir = File.dirname(file)
short = File.basename(file)
+
+ # If the dir isn't present, we clearly don't have the file.
+ #return nil unless FileTest.directory?(dir)
+
raise ArgumentError, "Tried to fix SSL files to a file containing
uppercase" unless short.downcase == short
real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
other.downcase == short
--
1.5.3.7
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
