diff options
| author | Luke Kanies <luke@madstop.com> | 2008-08-25 18:00:42 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-08-26 22:40:42 -0700 |
| commit | 8b45d13ab28837caf3bb09cc1c90ab61974bf4db (patch) | |
| tree | f249010d44605ec22db96130d280039a8882a672 /lib/puppet/file_serving/fileset.rb | |
| parent | 6ed8dfaf7c0cf091dca0374de310f524b0a033cc (diff) | |
| download | puppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.tar.gz puppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.tar.xz puppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.zip | |
Adding automatic attribute collection to the new fileserving code.
Basically, this just includes a consistent method for collecting
info (either content or metadata) and then calls that method
when returning instances via the indirector.
It's such a large commit mostly because of small changes in the normal
code and large changes in the testing to accomodate those small changes.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/file_serving/fileset.rb')
| -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 fe54350b1..80a718c68 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(@path, '').sub(%r{^/},'') } # And add the path itself. result.unshift(".") |