summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/settings.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-07 15:34:30 -0600
committerLuke Kanies <luke@madstop.com>2008-02-07 15:34:30 -0600
commitb293763f9ef2e134f18bb2c3fdaaaa502aa2c201 (patch)
treeeaa7e8eb8c4013be2e9c1560182558d393e5f5e7 /lib/puppet/util/settings.rb
parent2931723bae9e4226ab8eb7f6f806bf9a2ea5cbb8 (diff)
downloadpuppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.gz
puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.xz
puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.zip
Applying patch by Jay to fix #989 -- missing crl files are
correctly ignored, and you now use 'false' instead of 'none' to explicitly ignore them.
Diffstat (limited to 'lib/puppet/util/settings.rb')
-rw-r--r--lib/puppet/util/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index c84a5bfb1..cf15d3194 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -1124,7 +1124,7 @@ Generated on #{Time.now}.
# the variable 'dir', or adding a slash at the end.
def munge(value)
# If it's not a fully qualified path...
- if value.is_a?(String) and value !~ /^\$/ and value !~ /^\//
+ if value.is_a?(String) and value !~ /^\$/ and value !~ /^\// and value != 'false'
# Make it one
value = File.join(Dir.getwd, value)
end