diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-15 17:32:26 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-15 17:32:26 +0000 |
| commit | 48992d712bc6d226d117bebd887c0fd42816fc3a (patch) | |
| tree | a799c010936ae97bdce222d72dfe31790aef4357 /lib/puppet/parser/parser.rb | |
| parent | cda7253b2da3b6980f5cf2846f631597ef249000 (diff) | |
| download | puppet-48992d712bc6d226d117bebd887c0fd42816fc3a.tar.gz puppet-48992d712bc6d226d117bebd887c0fd42816fc3a.tar.xz puppet-48992d712bc6d226d117bebd887c0fd42816fc3a.zip | |
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
Diffstat (limited to 'lib/puppet/parser/parser.rb')
| -rw-r--r-- | lib/puppet/parser/parser.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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 ### |