diff options
| author | Dominic Cleal <dominic@cleal.org> | 2017-03-15 10:24:00 +0000 |
|---|---|---|
| committer | Dominic Cleal <dominic@cleal.org> | 2017-03-15 10:26:58 +0000 |
| commit | 0bca13947be9f55b7456cc78e2ba979bd7aa1c8c (patch) | |
| tree | 9b7b71145a4406aae32b132bd1ee7d00b9838100 | |
| parent | a38c9b736a4fe92a27d15cbbd968031d9589732e (diff) | |
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]+\/*)+$/] |