summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/file_serving/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb
index c59a54786..2a0199dee 100644
--- a/lib/puppet/file_serving/base.rb
+++ b/lib/puppet/file_serving/base.rb
@@ -23,11 +23,11 @@ class Puppet::FileServing::Base
# Return the full path to our file. Fails if there's no path set.
def full_path
- if relative_path.nil? or relative_path == "" or relative_path == "."
+ (if relative_path.nil? or relative_path == "" or relative_path == "."
path
else
File.join(path, relative_path)
- end
+ end).gsub(%r{/+}, "/")
end
def initialize(path, options = {})