From a9dbb5de66c9a97d13f7e7ade47bb6c3b5fa2e66 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Tue, 4 Nov 2008 17:22:27 -0600 Subject: Deduplicating slashes in the fileserving code Signed-off-by: Luke Kanies --- lib/puppet/file_serving/base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/puppet/file_serving') 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 = {}) -- cgit