Fixing the error thrown when a dependency cannot be retrieved, WRT to #395.

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

1 files changed, 9 insertions, 7 deletions

diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb
index 93fffc04c..1d58d27f2 100644
--- a/lib/puppet/metatype/metaparams.rb
+++ b/lib/puppet/metatype/metaparams.rb
@@ -266,14 +266,16 @@ class Puppet::Type
                 tname, name = value
                 object = nil
                 if type = Puppet::Type.type(tname)
-                    unless object = type[name]
-                        self.fail "Could not retrieve object '%s' of type '%s'" %
-                            [name,type]
-                    end
+                    object = type[name]
                 else # try to treat it as a component
-                    unless object = Puppet::Type::Component["#{tname}[#{name}]"]
-                        self.fail "Could not find object %s[%s]" % [tname, name]
-                    end
+                    object = Puppet::Type::Component["#{tname}[#{name}]"]
+                end
+                
+                # Either of the two retrieval attempts could have returned
+                # nil.
+                unless object
+                    self.fail "Could not retrieve dependency '%s[%s]'" %
+                        [type.capitalize, name]
                 end
                 
                 self.debug("subscribes to %s" % [object])