diff options
| author | Paul Nasrat <pnasrat@googlemail.com> | 2008-09-29 11:57:26 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-09-30 13:50:31 +1000 |
| commit | b2f0d872a273760c5ac65663685faea9be9ecfd5 (patch) | |
| tree | bfd2aefde778596813d079803debf9740d16116f /lib | |
| parent | a30ecf2aeffd71960bd806fb28cd6d1b8adc2452 (diff) | |
| download | puppet-b2f0d872a273760c5ac65663685faea9be9ecfd5.tar.gz puppet-b2f0d872a273760c5ac65663685faea9be9ecfd5.tar.xz puppet-b2f0d872a273760c5ac65663685faea9be9ecfd5.zip | |
Fix ticket 1596 in new fileset code, use tmpdir in fileserver tests.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/fileset.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index 7cd7366be..3cb76317d 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -20,7 +20,7 @@ class Puppet::FileServing::Fileset # Now strip off the leading path, so each file becomes relative, and remove # any slashes that might end up at the beginning of the path. - result = files.collect { |file| file.sub(%r{^#{@path}/*}, '') } + result = files.collect { |file| file.sub(%r{^#{Regexp.escape(@path)}/*}, '') } # And add the path itself. result.unshift(".") |