summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-03-24 16:44:44 -0700
committerNick Lewis <nick@puppetlabs.com>2011-03-24 16:44:44 -0700
commit0fec21fcd887685cf8421fdc309b878088f9fc48 (patch)
tree77745bbe6b91619d3255e4c517864b3a0f27b61f /lib/puppet
parent0f3e537a127ff0a55e25e0eea4b7513529867df3 (diff)
parent7761acb5acd998d172b04adb8368a6a672fcde25 (diff)
downloadpuppet-0fec21fcd887685cf8421fdc309b878088f9fc48.tar.gz
puppet-0fec21fcd887685cf8421fdc309b878088f9fc48.tar.xz
puppet-0fec21fcd887685cf8421fdc309b878088f9fc48.zip
Merge branch 'ticket/2.6.next/5221' into 2.6.next
Diffstat (limited to 'lib/puppet')
-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