summaryrefslogtreecommitdiffstats
path: root/lib/puppet/server/fileserver.rb
diff options
context:
space:
mode:
authorshafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-15 19:10:03 +0000
committershafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-15 19:10:03 +0000
commit0c97bb13d4b1aefda9768c000c542b3ddfc92b04 (patch)
tree74ff4d146935e2b0f649fe511923ee4bfd197adc /lib/puppet/server/fileserver.rb
parent897de465b38965c821bcedd32193d9069a378ae0 (diff)
downloadpuppet-0c97bb13d4b1aefda9768c000c542b3ddfc92b04.tar.gz
puppet-0c97bb13d4b1aefda9768c000c542b3ddfc92b04.tar.xz
puppet-0c97bb13d4b1aefda9768c000c542b3ddfc92b04.zip
fixed problem using arrays
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@670 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
-rwxr-xr-xlib/puppet/server/fileserver.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 3bf3582cc..76b1c9b69 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -82,13 +82,18 @@ class Server
end
def handleignore(children, path, ignore)
- ignore.each { |ignorepat|
+
+ ignore.each { |ignore|
+
ignored = []
+
Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
ignored.push(File.basename(match))
+ Puppet.info(match)
}
+
children = children - ignored
- }
+ }
return children
end