diff options
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 3 | ||||
| -rwxr-xr-x | lib/puppet/type/pfile/source.rb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index cd8511ad6..067f1da0f 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -420,6 +420,9 @@ class Server if path == "" path = nil + else + # Remove any double slashes that might have occurred + path.gsub!(/\/\//, "/") end return mount, path end diff --git a/lib/puppet/type/pfile/source.rb b/lib/puppet/type/pfile/source.rb index d2561a658..b33bdb38f 100755 --- a/lib/puppet/type/pfile/source.rb +++ b/lib/puppet/type/pfile/source.rb @@ -157,6 +157,8 @@ module Puppet # here doesn't really matter, because the @should values will be # overridden when we 'retrieve'. munge do |source| + # Remove any trailing slashes + source.sub!(/\/$/, '') unless @parent.uri2obj(source) raise Puppet::Error, "Invalid source %s" % source end |