diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-05-20 10:42:46 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-05-20 10:42:46 -0700 |
| commit | 9c3bedd6b4d53584967e42a7fd07441252b56f6e (patch) | |
| tree | c1ed661a99c3180fdb4d2e53eb4a740b02eb0041 /lib/puppet/type/file.rb | |
| parent | eeeab02fd97a625ec0e21ecd5d0ed7f0067027ef (diff) | |
| download | puppet-9c3bedd6b4d53584967e42a7fd07441252b56f6e.tar.gz puppet-9c3bedd6b4d53584967e42a7fd07441252b56f6e.tar.xz puppet-9c3bedd6b4d53584967e42a7fd07441252b56f6e.zip | |
(#7507) Add more 1.9 filters
Additionally we fixed a scoping issue with the File type.
Paired-With: Matt Robinson <matt@puppetlabs.com>
Diffstat (limited to 'lib/puppet/type/file.rb')
| -rw-r--r-- | lib/puppet/type/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index 1790c5e92..72e9a9495 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -264,7 +264,7 @@ Puppet::Type.newtype(:file) do parents = [] until basedir == parents.last parents << basedir - basedir = File.dirname(basedir) + basedir = ::File.dirname(basedir) end # The filename of the first ancestor found, or nil parents.find { |dir| catalog.resource(:file, dir) } |