From 0bca13947be9f55b7456cc78e2ba979bd7aa1c8c Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Wed, 15 Mar 2017 10:24:00 +0000
Subject: [PATCH] Permit double slash in absolute/Unix path types

---
 spec/aliases/absolute_path_spec.rb | 1 +
 spec/aliases/absolutepath_spec.rb  | 1 +
 spec/aliases/unixpath_spec.rb      | 2 ++
 types/unixpath.pp                  | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/aliases/absolute_path_spec.rb b/spec/aliases/absolute_path_spec.rb
index eeda76a9d..682c283cb 100644
--- a/spec/aliases/absolute_path_spec.rb
+++ b/spec/aliases/absolute_path_spec.rb
@@ -15,6 +15,7 @@
         /
         /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 aa435d7fe..a20c0717c 100644
--- a/spec/aliases/absolutepath_spec.rb
+++ b/spec/aliases/absolutepath_spec.rb
@@ -15,6 +15,7 @@
         //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 7824cb621..505516ae6 100644
--- a/spec/aliases/unixpath_spec.rb
+++ b/spec/aliases/unixpath_spec.rb
@@ -9,6 +9,8 @@
         /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 76f2c1783..ec3bf7d0e 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]+\/*)+$/]