summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-10 21:58:16 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-10 21:58:16 +0000
commit4ee395b28fa0e25372494e557ba0fc6d46fc6a1c (patch)
tree01fc7cb7b2d920d00ddef040465f43c4c7d1376f /lib
parent2cd67ad843409a49747748a1278e5ef788dd97bd (diff)
downloadpuppet-4ee395b28fa0e25372494e557ba0fc6d46fc6a1c.tar.gz
puppet-4ee395b28fa0e25372494e557ba0fc6d46fc6a1c.tar.xz
puppet-4ee395b28fa0e25372494e557ba0fc6d46fc6a1c.zip
Fixing small bug when autorequire returns an object instead of a string
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1002 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/type.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 89e20c067..1d2eea54c 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1384,8 +1384,13 @@ class Type < Puppet::Element
obj = nil
# Support them passing objects directly, to save some effort.
if dep.is_a? Puppet::Type
+ self.info "requiring %s" % dep.name
type = dep.class.name
obj = dep
+
+ # Now change our dependency to just the string, instead of
+ # the object itself.
+ dep = dep.name
else
# Skip autorequires that we aren't managing
unless obj = typeobj[dep]