Using the "trace" configuration parameter to determine whether a stack trace should be printed, rather than just using "debug". I added the param a little while ago and was using it internally in Puppet::DevError, but I just now went through the whole configuration and switched to using it.

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

12 files changed, 17 insertions, 23 deletions

diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index a4375a476..ccde7928b 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -70,9 +70,6 @@ module Puppet
                     except.file ||= @file
                     raise
                 rescue => detail
-                    #if Puppet[:debug]
-                    #    puts detail.backtrace
-                    #end
                     error = Puppet::DevError.new(
                         "Child of type %s failed with error %s: %s" %
                             [self.class, detail.class, detail.to_s]
diff --git a/lib/puppet/parser/ast/classdef.rb b/lib/puppet/parser/ast/classdef.rb
index 336cf0189..e09db985f 100644
--- a/lib/puppet/parser/ast/classdef.rb
+++ b/lib/puppet/parser/ast/classdef.rb
@@ -52,7 +52,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
         end
diff --git a/lib/puppet/parser/ast/compdef.rb b/lib/puppet/parser/ast/compdef.rb
index b6cd6491f..17ee60181 100644
--- a/lib/puppet/parser/ast/compdef.rb
+++ b/lib/puppet/parser/ast/compdef.rb
@@ -54,7 +54,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
         end
diff --git a/lib/puppet/parser/ast/component.rb b/lib/puppet/parser/ast/component.rb
index 2621c76ad..ebbf21959 100644
--- a/lib/puppet/parser/ast/component.rb
+++ b/lib/puppet/parser/ast/component.rb
@@ -97,7 +97,7 @@ class Puppet::Parser::AST
                     error = Puppet::ParseError.new(except.message)
                     error.line = self.line
                     error.file = self.file
-                    error.backtrace = except.backtrace
+                    error.set_backtrace except.backtrace
                     raise error
                 end
             }
diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb
index 82302083d..7b9a283d7 100644
--- a/lib/puppet/parser/ast/leaf.rb
+++ b/lib/puppet/parser/ast/leaf.rb
@@ -97,7 +97,7 @@ class Puppet::Parser::AST
                 error = Puppet::DevError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
         end
diff --git a/lib/puppet/parser/ast/objectdef.rb b/lib/puppet/parser/ast/objectdef.rb
index cdcbd1aca..ac5fe3070 100644
--- a/lib/puppet/parser/ast/objectdef.rb
+++ b/lib/puppet/parser/ast/objectdef.rb
@@ -59,7 +59,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
 
@@ -138,7 +138,7 @@ class Puppet::Parser::AST
                     error = Puppet::ParseError.new(detail)
                     error.line = self.line
                     error.file = self.file
-                    error.backtrace = detail.backtrace
+                    error.set_backtrace detail.backtrace
                     raise error
                 end
             }.reject { |obj| obj.nil? }
@@ -294,7 +294,7 @@ class Puppet::Parser::AST
                         error = Puppet::DevError.new(
                             "failed to tree a %s" % self.class
                         )
-                        error.backtrace = detail.backtrace
+                        error.set_backtrace detail.backtrace
                         raise error
                     end
                 }.join("\n")
diff --git a/lib/puppet/parser/ast/objectref.rb b/lib/puppet/parser/ast/objectref.rb
index 12e36360f..f9a63e222 100644
--- a/lib/puppet/parser/ast/objectref.rb
+++ b/lib/puppet/parser/ast/objectref.rb
@@ -33,7 +33,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
 
diff --git a/lib/puppet/parser/ast/typedefaults.rb b/lib/puppet/parser/ast/typedefaults.rb
index e6ffe7080..2e11a1b94 100644
--- a/lib/puppet/parser/ast/typedefaults.rb
+++ b/lib/puppet/parser/ast/typedefaults.rb
@@ -25,7 +25,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
         end
diff --git a/lib/puppet/parser/ast/vardef.rb b/lib/puppet/parser/ast/vardef.rb
index 4b1eb90d2..79129f31a 100644
--- a/lib/puppet/parser/ast/vardef.rb
+++ b/lib/puppet/parser/ast/vardef.rb
@@ -20,7 +20,7 @@ class Puppet::Parser::AST
                 error = Puppet::ParseError.new(detail)
                 error.line = self.line
                 error.file = self.file
-                error.backtrace = detail.backtrace
+                error.set_backtrace detail.backtrace
                 raise error
             end
         end
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index c4883deef..623ca0cab 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -695,7 +695,7 @@ def parse(string = nil)
         error = Puppet::ParseError.new(except)
         error.line = @lexer.line
         error.file = @lexer.file
-        error.backtrace = except.backtrace
+        error.set_backtrace except.backtrace
         raise error
     rescue Puppet::ParseError => except
         except.line ||= @lexer.line
@@ -720,7 +720,7 @@ def parse(string = nil)
         error = Puppet::DevError.new(except.message)
         error.line = @lexer.line
         error.file = @lexer.file
-        error.backtrace = except.backtrace
+        error.set_backtrace except.backtrace
         #if Puppet[:debug]
         #    puts caller
         #end
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 19d61c276..ad30e6ed3 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -326,10 +326,7 @@ module Puppet
                 rescue => except
                     error = Puppet::DevError.new("%s: %s" %
                         [except.class, except.message])
-                    error.backtrace = except.backtrace
-                    #if Puppet[:debug]
-                    #    puts except.backtrace
-                    #end
+                    error.set_backtrace except.backtrace
                     raise error
                 end
 
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 85a958761..41c119c2c 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id7713d53378', 'grammar.ra', 603
+module_eval <<'..end grammar.ra modeval..idab2f060823', 'grammar.ra', 603
 require 'puppet/parser/functions'
 
 attr_reader :file
@@ -125,7 +125,7 @@ def parse(string = nil)
         error = Puppet::ParseError.new(except)
         error.line = @lexer.line
         error.file = @lexer.file
-        error.backtrace = except.backtrace
+        error.set_backtrace except.backtrace
         raise error
     rescue Puppet::ParseError => except
         except.line ||= @lexer.line
@@ -150,7 +150,7 @@ def parse(string = nil)
         error = Puppet::DevError.new(except.message)
         error.line = @lexer.line
         error.file = @lexer.file
-        error.backtrace = except.backtrace
+        error.set_backtrace except.backtrace
         #if Puppet[:debug]
         #    puts caller
         #end
@@ -175,7 +175,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id7713d53378
+..end grammar.ra modeval..idab2f060823
 
 ##### racc 1.4.5 generates ###