Undoing the merge that happened in 785

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

2 files changed, 3 insertions, 12 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))
                 }                
diff --git a/lib/puppet/server/logger.rb b/lib/puppet/server/logger.rb
index d5feb0320..0ee2d75f0 100755
--- a/lib/puppet/server/logger.rb
+++ b/lib/puppet/server/logger.rb
@@ -10,11 +10,6 @@ class Server # :nodoc:
 
         # accept a log message from a client, and route it accordingly
         def addlog(message, client = nil, clientip = nil)
-            unless message
-                raise Puppet::DevError, "Did not receive message"
-            end
-
-            Puppet.info message.inspect
             # if the client is set, then we're not local
             if client
                 begin
@@ -27,10 +22,6 @@ class Server # :nodoc:
                 end
             end
 
-            unless message
-                raise Puppet::DevError, "Could not resurrect message"
-            end
-
             # Mark it as remote, so it's not sent to syslog
             message.remote = true