switching log.rb to raise Puppet::DevError events

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

2 files changed, 10 insertions, 5 deletions

diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb
index 02d82aae7..76eb3280b 100644
--- a/lib/puppet/log.rb
+++ b/lib/puppet/log.rb
@@ -128,7 +128,7 @@ module Puppet
             end
 
             unless @@levels.include?(level)
-                raise "Invalid loglevel %s" % level
+                raise Puppet::DevError, "Invalid loglevel %s" % level
             end
 
             @@loglevel = @@levels.index(level)
@@ -144,7 +144,8 @@ module Puppet
                 end
             when :file:
                 unless defined? @@logfile
-                    raise "Log file must be defined before we can log to it"
+                    raise Puppet::DevError,
+                        "Log file must be defined before we can log to it"
                 end
                 @@logfile.puts("%s %s (%s): %s" %
                     [msg.time,msg.source,msg.level,msg.to_s])
@@ -172,7 +173,7 @@ module Puppet
 		def initialize(args)
 			unless args.include?(:level) && args.include?(:message) &&
 						args.include?(:source) 
-				raise "Puppet::Log called incorrectly"
+				raise Puppet::DevError, "Puppet::Log called incorrectly"
 			end
 
 			if args[:level].class == String
@@ -180,7 +181,8 @@ module Puppet
 			elsif args[:level].class == Symbol
 				@level = args[:level]
 			else
-				raise "Level is not a string or symbol: #{args[:level].class}"
+				raise Puppet::DevError,
+                    "Level is not a string or symbol: #{args[:level].class}"
 			end
 			@message = args[:message]
 			@source = args[:source] || "Puppet"
@@ -188,7 +190,7 @@ module Puppet
 			# this should include the host name, and probly lots of other
 			# stuff, at some point
 			unless @@levels.include?(level)
-				raise "Invalid message level #{level}"
+				raise Puppet::DevError, "Invalid message level #{level}"
 			end
 
             Log.newmessage(self)
diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index 196e2447d..9b92d27c9 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -1152,6 +1152,7 @@ module Puppet
                 end
 
                 def initialize(hash)
+                    @parentclass = nil
                     super
                 end
 
@@ -1312,6 +1313,8 @@ module Puppet
                             error.file = self.file
                             raise error
                         end
+                        # FIXME I should only have _one_ instance of a given
+                        # parent class
                         parentobj.safeevaluate(scope,hash,@parentclass,objname)
                     end