summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-14 15:15:21 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-14 15:15:21 +0000
commit613c413cd84a690f1fb0cb625380e430bc502c84 (patch)
treef20c5b4a19076287817bbb7593c9c0a4d9a058f7 /lib
parentaed12c36514738e6ec3916e4fc849ef32ed2e716 (diff)
downloadpuppet-613c413cd84a690f1fb0cb625380e430bc502c84.tar.gz
puppet-613c413cd84a690f1fb0cb625380e430bc502c84.tar.xz
puppet-613c413cd84a690f1fb0cb625380e430bc502c84.zip
Fixing a path problem that resulted from the changes I made to internal variable names -- the pathbuilder method in file referred to @resource instead of @parent
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2510 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/type/pfile.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 62524f37b..bec0a4dd2 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -669,12 +669,12 @@ module Puppet
# path names, rather than including the full parent's title each
# time.
def pathbuilder
- if defined? @resource
+ if defined? @parent
# We only need to behave specially when our parent is also
# a file
- if @resource.is_a?(self.class)
+ if @parent.is_a?(self.class)
# Remove the parent file name
- list = @resource.pathbuilder
+ list = @parent.pathbuilder
list.pop # remove the parent's path info
return list << self.ref
else