summaryrefslogtreecommitdiffstats
path: root/lib/puppet/file_serving
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-01-22 04:32:10 +1100
committerNick Lewis <nick@puppetlabs.com>2011-03-24 14:11:00 -0700
commit357514ceec94df18abf98e5b906b50cb0dcf4cbd (patch)
tree0d58705f0000460f819b990de9d6973e75f8088d /lib/puppet/file_serving
parent76d1c2aefb32cc3688e3f7c0a5c8bbf713a123ed (diff)
downloadpuppet-357514ceec94df18abf98e5b906b50cb0dcf4cbd.tar.gz
puppet-357514ceec94df18abf98e5b906b50cb0dcf4cbd.tar.xz
puppet-357514ceec94df18abf98e5b906b50cb0dcf4cbd.zip
(#5221) Fix fileset path absoluteness checking with trailing slash
Reviewed-By: Nick Lewis Reviewed-By: Pieter van de Bruggen
Diffstat (limited to 'lib/puppet/file_serving')
-rw-r--r--lib/puppet/file_serving/fileset.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb
index fdbcf93a3..c020f036d 100644
--- a/lib/puppet/file_serving/fileset.rb
+++ b/lib/puppet/file_serving/fileset.rb
@@ -59,6 +59,7 @@ class Puppet::FileServing::Fileset
end
def initialize(path, options = {})
+ path = path.chomp(File::SEPARATOR)
raise ArgumentError.new("Fileset paths must be fully qualified") unless File.expand_path(path) == path
@path = path