summaryrefslogtreecommitdiffstats
path: root/lib/puppet/file_serving/fileset.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-28 23:09:52 -0700
committerLuke Kanies <luke@madstop.com>2008-08-28 23:09:52 -0700
commitbd1163a339ff66dbb9a50a1cb13f6320cb056cc3 (patch)
tree73c539efd401a5a1880cc5b74ce2eee94e9c98b3 /lib/puppet/file_serving/fileset.rb
parent5da26067cc76ad318359d9287ab1267d7a6c5b0b (diff)
downloadpuppet-bd1163a339ff66dbb9a50a1cb13f6320cb056cc3.tar.gz
puppet-bd1163a339ff66dbb9a50a1cb13f6320cb056cc3.tar.xz
puppet-bd1163a339ff66dbb9a50a1cb13f6320cb056cc3.zip
Fixing filesets to allow nil ignore values.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/file_serving/fileset.rb')
-rw-r--r--lib/puppet/file_serving/fileset.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb
index 80a718c68..a90734a2b 100644
--- a/lib/puppet/file_serving/fileset.rb
+++ b/lib/puppet/file_serving/fileset.rb
@@ -30,6 +30,8 @@ class Puppet::FileServing::Fileset
# Should we ignore this path?
def ignore?(path)
+ return false if @ignore == [nil]
+
# 'detect' normally returns the found result, whereas we just want true/false.
! @ignore.detect { |pattern| File.fnmatch?(pattern, path) }.nil?
end