diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-05-03 16:31:37 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-05-03 16:31:37 -0700 |
| commit | 71af776efc45daaaf14ca66db41261d6906bfd1b (patch) | |
| tree | d7ba3529c0cbc64f4cc1cebb36cf9b784fac5374 /lib/puppet | |
| parent | 18b3584e16515cfc45aeaa8d0913de8e8bcb3e95 (diff) | |
| parent | 1f112cd61ff9e9a3b4a27314533ea4a91dcca76e (diff) | |
| download | puppet-71af776efc45daaaf14ca66db41261d6906bfd1b.tar.gz puppet-71af776efc45daaaf14ca66db41261d6906bfd1b.tar.xz puppet-71af776efc45daaaf14ca66db41261d6906bfd1b.zip | |
Merge branch 'ticket/2.7.x/7139' into 2.7.x
Diffstat (limited to 'lib/puppet')
| -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 |