diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-09 16:44:38 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-09 16:44:38 +0000 |
| commit | c3cc16274d2a2cc0b394bb7ec7fbb8b45491abcc (patch) | |
| tree | 6b32de49708c8f1ba2252ade9f00b20bf92905fd /lib | |
| parent | c8ea361d6af3cac2022d3726aafc1d9ae7c52f97 (diff) | |
| download | puppet-c3cc16274d2a2cc0b394bb7ec7fbb8b45491abcc.tar.gz puppet-c3cc16274d2a2cc0b394bb7ec7fbb8b45491abcc.tar.xz puppet-c3cc16274d2a2cc0b394bb7ec7fbb8b45491abcc.zip | |
Fixing #309 -- files now correctly replace any number of slashes with a single slash. Also, trailing slashes are removed, since that is how Puppet expects to find files internally.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1749 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type/pfile.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index d89fe17e3..3a07acac7 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -421,6 +421,10 @@ module Puppet @clients = {} super + + # Get rid of any duplicate slashes, and remove any trailing slashes. + @title = @title.gsub(/\/+/, "/").sub(/\/$/, "") + # Clean out as many references to any file paths as possible. # This was the source of many, many bugs. @arghash = tmphash |