diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-03-05 20:52:21 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-03-05 20:52:21 +1100 |
| commit | ba2dde2d94188af63836845cd6db1c37acecd5c4 (patch) | |
| tree | 70eb4abaa7afa894643e3ee549431adb12a13695 /lib | |
| parent | 281448fb47a7c88bf8d1c3222d03264ecfaeb183 (diff) | |
| parent | 443db2009d0f5033eb51ebd210af2a198572fad0 (diff) | |
| download | puppet-ba2dde2d94188af63836845cd6db1c37acecd5c4.tar.gz puppet-ba2dde2d94188af63836845cd6db1c37acecd5c4.tar.xz puppet-ba2dde2d94188af63836845cd6db1c37acecd5c4.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 57f84d5f7..a0cd1e726 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -25,7 +25,7 @@ require 'puppet/util/suidmanager' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '0.24.1' + PUPPETVERSION = '0.24.2' def Puppet.version return PUPPETVERSION 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? |