Merge pull request #277 from buzzdeee/concat_order_verification_fix

Morgan Haskel · Morgan Haskel · commit 30fbfe11aaf6 · 2015-03-02T14:14:22.000-08:00
Fixup $order parameter verification
diff --git a/manifests/fragment.pp b/manifests/fragment.pp
@@ -42,7 +42,7 @@
   }
   if !(is_string($order) or is_integer($order)) {
     fail('$order is not a string or integer.')
-  } elsif $order =~ /[:\n\/]/ {
+  } elsif (is_string($order) and $order =~ /[:\n\/]/) {
     fail("Order cannot contain '/', ':', or '\n'.")
   }
   if $mode {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`}`
`43`	`43`	`if !(is_string($order) or is_integer($order)) {`
`44`	`44`	`fail('$order is not a string or integer.')`
`45`		`- } elsif $order =~ /[:\n\/]/ {`
	`45`	`+ } elsif (is_string($order) and $order =~ /[:\n\/]/) {`
`46`	`46`	`fail("Order cannot contain '/', ':', or '\n'.")`
`47`	`47`	`}`
`48`	`48`	`if $mode {`