Preliminary commit of the first phase of the parser redesign. The biggest difference is that overrides should now work for definitions (although i do not yet have a test case -- i will add one on the next commit). The way this is implemented is by having scopes translate themselves at eval time, but in two phases -- the first phase does the overrides, and the second phase does the evaluation of definitions and classes.

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

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb
index 5e9d880f1..1c5715a60 100644
--- a/lib/puppet/server/master.rb
+++ b/lib/puppet/server/master.rb
@@ -142,17 +142,17 @@ class Server
             # This is hackish, but there's no "silence" option for benchmarks
             # right now
             if @local
-                begin
+                #begin
                     retobjects = @interpreter.run(client, facts)
-                rescue Puppet::Error => detail
-                    Puppet.err detail
-                    raise XMLRPC::FaultException.new(
-                        1, detail.to_s
-                    )
-                rescue => detail
-                    Puppet.err detail.to_s
-                    return ""
-                end
+                #rescue Puppet::Error => detail
+                #    Puppet.err detail
+                #    raise XMLRPC::FaultException.new(
+                #        1, detail.to_s
+                #    )
+                #rescue => detail
+                #    Puppet.err detail.to_s
+                #    return ""
+                #end
             else
                 benchmark(:notice, "Compiled configuration for %s" % client) do
                     begin