summaryrefslogtreecommitdiffstats
path: root/lib/puppet/server/fileserver.rb
diff options
context:
space:
mode:
authorshafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-23 05:51:48 +0000
committershafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-23 05:51:48 +0000
commitd20ac8e0b564e5413d571f2059de559e0783b72d (patch)
tree642d87dc1261af9b6e65dcf8bbd08adc51eab6aa /lib/puppet/server/fileserver.rb
parent4c13c1053a9dcf14d9783bef288a7e98cda6fd9e (diff)
downloadpuppet-d20ac8e0b564e5413d571f2059de559e0783b72d.tar.gz
puppet-d20ac8e0b564e5413d571f2059de559e0783b72d.tar.xz
puppet-d20ac8e0b564e5413d571f2059de559e0783b72d.zip
Hoping this will get rid of the directory being printed
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@702 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
-rwxr-xr-xlib/puppet/server/fileserver.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index a666b4c7a..519d4aa0c 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -81,17 +81,11 @@ class Server
return desc.join("\t")
end
- def handleignore(children, path, ignore)
-
- ignore.each { |ignore|
-
- ignored = []
-
+ def handleignore(children, path, ignore)
+ ignore.each { |ignore|
Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
- ignored.push(File.basename(match))
- }
-
- children = children - ignored
+ children.delete(File.basename(match))
+ }
}
return children
end