Merge pull request #1555 from sathieu/rewrites_nofail

Don't fail if first element of is not an hash before flattening
puppetlabs · Dec 12, 2016 · 65ee137 · 65ee137
2 parents 5a439d8 + e8b9a50
commit 65ee137
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -192,7 +192,8 @@
   if $rewrites {
     validate_array($rewrites)
     unless empty($rewrites) {
-      validate_hash($rewrites[0])
+      $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
+      validate_hash($rewrites_flattened[0])
     }
   }
 

diff --git a/metadata.json b/metadata.json
@@ -8,7 +8,7 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.2.0 < 5.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 3.0.0"}
   ],
   "data_provider": null,