diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-15 23:13:01 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-15 23:13:01 +0000 |
| commit | f0907607347c26127dd566fbe5b19c8528d25f5d (patch) | |
| tree | 71870616c3b4648b9da9a5bcb402c23fd14133d7 | |
| parent | 084a31da45e5069ec485b502e388604591857200 (diff) | |
| download | puppet-f0907607347c26127dd566fbe5b19c8528d25f5d.tar.gz puppet-f0907607347c26127dd566fbe5b19c8528d25f5d.tar.xz puppet-f0907607347c26127dd566fbe5b19c8528d25f5d.zip | |
Fixing my autorequire fix; oops
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1292 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet/type.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 064b759f2..926d53f6f 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -1428,7 +1428,6 @@ class Type < Puppet::Element # Collect the current prereqs list.each { |dep| obj = nil - type = nil # Support them passing objects directly, to save some effort. if dep.is_a? Puppet::Type type = dep.class.name @@ -1443,10 +1442,11 @@ class Type < Puppet::Element next end end + # Skip autorequires that we already require next if self.requires?(obj) - info "Auto-requiring %s %s" % [obj.class.name, obj.name] + debug "Autorequiring %s %s" % [obj.class.name, obj.name] self[:require] = [type, dep] } |