From abf40f0485e2e40cc55e58ce9ffac440d85a850d Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Mon, 1 Jun 2015 10:45:00 -0700 Subject: [PATCH 1/2] update README with correct behavior for fragment parameter --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 873f6478a..69b9a8983 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ Specifies a file to read into the content of the fragment. **Note**: You must su #####`target` -*Required.* Specifies the destination file of the fragment. Valid options: a string containing an absolute path. +*Required.* Specifies the destination file of the fragment. Valid options: a string containing the title of the parent `concat` resource. ###Deprecations @@ -280,4 +280,4 @@ For more information, see our [module contribution guide.](https://docs.puppetla ###Contributors -To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors) \ No newline at end of file +To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors) From d4376cb3f5d98d5236eaa3bcb07951ab3cb9e631 Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Mon, 1 Jun 2015 12:05:31 -0700 Subject: [PATCH 2/2] updates init.pp to pass linting --- manifests/init.pp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index c44c03284..57f6425bd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -99,6 +99,7 @@ $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.' $bool_warn_message = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release' + # lint:ignore:quoted_booleans case $warn { true: { $warn_message = $default_warn_message @@ -118,6 +119,7 @@ $warn_message = $warn } } + # lint:endignore $warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G') $warnflag = $warnmsg_escaped ? { @@ -177,15 +179,15 @@ } file { $name: - ensure => present, - owner => $owner, - group => $group, - mode => $mode, - replace => $replace, - path => $path, - alias => "concat_${name}", - source => "${fragdir}/${concat_name}", - backup => $backup, + ensure => present, + owner => $owner, + group => $group, + mode => $mode, + replace => $replace, + path => $path, + alias => "concat_${name}", + source => "${fragdir}/${concat_name}", + backup => $backup, } # Only newer versions of puppet 3.x support the validate_cmd parameter @@ -243,7 +245,7 @@ $absent_exec_command = $::kernel ? { 'windows' => 'cmd.exe /c exit 0', - default => 'true', + default => true, } $absent_exec_path = $::kernel ? {