From: Peter Souter <p.souter@kainos.com>
Date: Thu, 18 Dec 2014 23:08:13 +0000 (+0000)
Subject: (MODULES-1582) Improve % detection
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b3d007f1daa9bd7c8c02f372494df3a6e6ff6acf;p=puppet-stdlib.git

(MODULES-1582) Improve % detection

Avoids any validate commands that have %'s in them other than "... % ..."
---

diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb
index 7290265..5df3c60 100644
--- a/lib/puppet/parser/functions/validate_cmd.rb
+++ b/lib/puppet/parser/functions/validate_cmd.rb
@@ -39,7 +39,7 @@ module Puppet::Parser::Functions
       tmpfile.write(content)
       tmpfile.close
 
-      if checkscript.include?('%')
+      if checkscript =~ /\s%(\s|$)/
         check_with_correct_location = checkscript.gsub(/%/,tmpfile.path)
       else
         check_with_correct_location = "#{checkscript} #{tmpfile.path}"