diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:33:38 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-07 23:33:38 +0000 |
| commit | 23f982ecda3fd74867d404b5e784f072db9a1cde (patch) | |
| tree | 18a122eec695455c794caa554012fe1ee721ffa6 /lib/puppet/element.rb | |
| parent | 1d739731b20a5dd10a190d783556d5c5a0275137 (diff) | |
| download | puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.tar.gz puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.tar.xz puppet-23f982ecda3fd74867d404b5e784f072db9a1cde.zip | |
Undoing the merge that happened in 785
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@786 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 7e499567a..4d1ad8bac 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.to_s] + @path = [self.class.name.to_s + "=" + self.name] end end end |