Raising element creation errors up outside the "create" method, so that tests can more easily tell when an object is invalid.

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

2 files changed, 14 insertions, 15 deletions

diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index 0d775f7e0..90bc70fc2 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -264,9 +264,11 @@ module Puppet
                 end
 
                 # Now just call to_type on them with the container as a parent
-                unless obj = child.to_type(container)
-                    # nothing; we assume the method already warned
-                    #Puppet.warning "Could not create child %s" % child.name
+                begin
+                    child.to_type(container)
+                rescue => detail
+                    # We don't do anything on failures, since we assume it's
+                    # been logged elsewhere.
                 end
             }
 
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index f422940fe..19a77b4bc 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -365,13 +365,14 @@ class Type < Puppet::Element
     # Find the namevar
     def self.namevar
         unless defined? @namevar
-            return nil unless defined? @parameters and ! @parameters.empty?
-            namevarparam = @parameters.find { |param|
-                param.isnamevar?
+            params = @parameters.find_all { |param|
+                param.isnamevar? or param.name == :name
             }
 
-            if namevarparam
-                @namevar = namevarparam.name
+            if params.length > 1
+                raise Puppet::DevError, "Found multiple namevars for %s" % self.name
+            elsif params.length == 1
+                @namevar = params[0].name
             else
                 raise Puppet::DevError, "No namevar for %s" % self.name
             end
@@ -1388,22 +1389,18 @@ class Type < Puppet::Element
         end
 
         # create it anew
-        # if there's a failure, destroy the object if it got that far
+        # if there's a failure, destroy the object if it got that far, but raise
+        # the error.
         begin
             obj = new(hash)
         rescue => detail
-            unless detail.is_a? Puppet::Error
-                if Puppet[:debug]
-                    puts detail.backtrace
-                end
-            end
             Puppet.err "Could not create %s: %s" % [title, detail.to_s]
             if obj
                 obj.remove(true)
             elsif obj = self[title]
                 obj.remove(true)
             end
-            return nil
+            raise
         end
 
         if implicit