diff options
| author | Wilson McCoubrey <wilson@mccoubreys.co.uk> | 2017-03-16 13:40:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 13:40:26 +0000 |
| commit | 2a7c2beddb76fbfc98121acc34b53f925d5232ad (patch) | |
| tree | 0059f8ab3910f6d2adc8fb9950e88241d790b4d6 | |
| parent | 08d96808c63535da8280477a01631c9b67463595 (diff) | |
| parent | 0bca13947be9f55b7456cc78e2ba979bd7aa1c8c (diff) | |
Merge pull request #740 from domcleal/abspath-double-slash
Permit double slash in absolute/Unix path types
| -rw-r--r-- | spec/aliases/absolute_path_spec.rb | 1 | ||||
| -rw-r--r-- | spec/aliases/absolutepath_spec.rb | 1 | ||||
| -rw-r--r-- | spec/aliases/unixpath_spec.rb | 2 | ||||
| -rw-r--r-- | types/unixpath.pp | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/spec/aliases/absolute_path_spec.rb b/spec/aliases/absolute_path_spec.rb index eeda76a..682c283 100644 --- a/spec/aliases/absolute_path_spec.rb +++ b/spec/aliases/absolute_path_spec.rb @@ -15,6 +15,7 @@ if Puppet.version.to_f >= 4.5 / /var/tmp /var/opt/../lib/puppet + /var/opt//lib/puppet /var/ůťƒ8 /var/ネット }.each do |value| diff --git a/spec/aliases/absolutepath_spec.rb b/spec/aliases/absolutepath_spec.rb index aa435d7..a20c071 100644 --- a/spec/aliases/absolutepath_spec.rb +++ b/spec/aliases/absolutepath_spec.rb @@ -15,6 +15,7 @@ if Puppet.version.to_f >= 4.5 //host/windows /var/tmp /var/opt/../lib/puppet + /var/opt//lib/puppet }.each do |value| describe value.inspect do let(:params) {{ value: value }} diff --git a/spec/aliases/unixpath_spec.rb b/spec/aliases/unixpath_spec.rb index 7824cb6..505516a 100644 --- a/spec/aliases/unixpath_spec.rb +++ b/spec/aliases/unixpath_spec.rb @@ -9,6 +9,8 @@ if Puppet.version.to_f >= 4.5 /Users/helencampbell/workspace/puppetlabs-stdlib /var/ůťƒ8 /var/ネット + /var//tmp + /var/../tmp }.each do |value| describe value.inspect do let(:params) {{ value: value }} diff --git a/types/unixpath.pp b/types/unixpath.pp index 76f2c17..ec3bf7d 100644 --- a/types/unixpath.pp +++ b/types/unixpath.pp @@ -1,2 +1,2 @@ # this regex rejects any path component that is a / or a NUL -type Stdlib::Unixpath = Pattern[/^\/([^\/\0]+(\/)?)+$/] +type Stdlib::Unixpath = Pattern[/^\/([^\/\0]+\/*)+$/] |