diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-08 00:02:23 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-08 00:02:23 +0000 |
| commit | cbf10c5e365fb7440c89321a2c329e40424d30b4 (patch) | |
| tree | 6be719c4848e73d75d8661f240cd4e1e2f1f2a1d /lib/puppet/element.rb | |
| parent | 23f982ecda3fd74867d404b5e784f072db9a1cde (diff) | |
| download | puppet-cbf10c5e365fb7440c89321a2c329e40424d30b4.tar.gz puppet-cbf10c5e365fb7440c89321a2c329e40424d30b4.tar.xz puppet-cbf10c5e365fb7440c89321a2c329e40424d30b4.zip | |
Merging changes from the head of the rework1 branch, r 784
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@787 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/element.rb')
| -rw-r--r-- | lib/puppet/element.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/element.rb b/lib/puppet/element.rb index 4d1ad8bac..7e499567a 100644 --- a/lib/puppet/element.rb +++ b/lib/puppet/element.rb @@ -40,7 +40,7 @@ class Puppet::Element def path unless defined? @path if defined? @parent and @parent - if self.is_a?(Puppet::Type::Component) + if self.is_a?(Puppet.type(:component)) @path = [@parent.path, self.name] else @path = [@parent.path, self.class.name.to_s + "=" + self.name] @@ -54,10 +54,10 @@ class Puppet::Element else # We assume that if we don't have a parent that we should not # cache the path - if self.is_a?(Puppet::Type::Component) + if self.is_a?(Puppet.type(:component)) @path = [self.name] else - @path = [self.class.name.to_s + "=" + self.name] + @path = [self.class.name.to_s + "=" + self.name.to_s] end end end |