diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-05-03 16:21:16 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-05-03 16:21:16 -0700 |
| commit | 97e8ef32ff174a795a73d045ef1df99d8de51356 (patch) | |
| tree | b87d09c1b1f3ed8bcc758cbdbe3757de4dc64bb6 /lib | |
| parent | 37c86dd466aa571b0194b06bbf4d21ffb007c8be (diff) | |
| parent | 90eb937a093b6dd962ee136a4e6f84cfa3ba72cd (diff) | |
| download | puppet-97e8ef32ff174a795a73d045ef1df99d8de51356.tar.gz puppet-97e8ef32ff174a795a73d045ef1df99d8de51356.tar.xz puppet-97e8ef32ff174a795a73d045ef1df99d8de51356.zip | |
Merge branch 'ticket/2.6.next/7139' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/fileset.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index c020f036d..f29f70a53 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -59,7 +59,7 @@ class Puppet::FileServing::Fileset end def initialize(path, options = {}) - path = path.chomp(File::SEPARATOR) + path = path.chomp(File::SEPARATOR) unless path == File::SEPARATOR raise ArgumentError.new("Fileset paths must be fully qualified") unless File.expand_path(path) == path @path = path |