diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:33:38 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:33:38 +0000 |
commit | 23f982ecda3fd74867d404b5e784f072db9a1cde (patch) | |
tree | 18a122eec695455c794caa554012fe1ee721ffa6 /lib/puppet/server/fileserver.rb | |
parent | 1d739731b20a5dd10a190d783556d5c5a0275137 (diff) | |
download | puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.tar.gz puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.tar.xz puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.zip |
Undoing the merge that happened in 785
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@786 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
-rwxr-xr-x | lib/puppet/server/fileserver.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index 9130b3df5..92bc129ec 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -28,8 +28,8 @@ class Server end obj = nil - unless obj = Puppet.type(:file)[dir] - obj = Puppet.type(:file).create( + unless obj = Puppet::Type::PFile[dir] + obj = Puppet::Type::PFile.create( :name => dir, :check => CHECKPARAMS ) @@ -87,7 +87,7 @@ class Server # Deal with ignore parameters. def handleignore(children, path, ignore) - ignore.value.each { |ignore| + ignore.each { |ignore| Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match| children.delete(File.basename(match)) } |