Merging changes from the head of the rework1 branch, r 784

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@787 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 92bc129ec..9130b3df5 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::PFile[dir]
-                obj = Puppet::Type::PFile.create(
+            unless obj = Puppet.type(:file)[dir]
+                obj = Puppet.type(:file).create(
                     :name => dir,
                     :check => CHECKPARAMS
                 )
@@ -87,7 +87,7 @@ class Server
 
         # Deal with ignore parameters.
         def handleignore(children, path, ignore)            
-            ignore.each { |ignore|                
+            ignore.value.each { |ignore|                
                 Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
                     children.delete(File.basename(match))
                 }