diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-03 10:29:08 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-03 10:29:08 -0600 |
| commit | ee88c58546c2ca2bf7d77fd36d6443777eb0965f (patch) | |
| tree | 63b9c5a2e9098a841c292c288c6295fa75af03d5 /lib/puppet/network/handler/fileserver.rb | |
| parent | ba803a1fb8190997f277b83d50c531b446b2a67f (diff) | |
| download | puppet-ee88c58546c2ca2bf7d77fd36d6443777eb0965f.tar.gz puppet-ee88c58546c2ca2bf7d77fd36d6443777eb0965f.tar.xz puppet-ee88c58546c2ca2bf7d77fd36d6443777eb0965f.zip | |
Applying patch by DavidS to fix #1083.
Diffstat (limited to 'lib/puppet/network/handler/fileserver.rb')
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index a9a95bcfe..751a77220 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -69,8 +69,8 @@ class Puppet::Network::Handler mount.debug("Describing %s for %s" % [url, client]) if client - # Remove any leading slashes, since Metadata doesn't like them, yo. - metadata = Puppet::FileServing::Metadata.new(url, :path => mount.path(client), :relative_path => path.sub(/^\//, ''), :links => links) + # use the mount to resolve the path for us. + metadata = Puppet::FileServing::Metadata.new(url, :path => mount.file_path(path, client), :links => links) return "" unless metadata.exist? |