From b6e9b1c693d1590b566563e2491748b60cab9a94 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 1 Nov 2013 18:52:59 -0700 Subject: [PATCH] fix or suppress all lint warnings --- Rakefile | 4 ++++ manifests/init.pp | 2 +- manifests/setup.pp | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index bb60173..edd0a23 100644 --- a/Rakefile +++ b/Rakefile @@ -1,2 +1,6 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'rspec-system/rake_task' +require 'puppet-lint/tasks/puppet-lint' + +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_quoted_booleans') diff --git a/manifests/init.pp b/manifests/init.pp index 774113c..8987600 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -103,7 +103,7 @@ define concat( $use_warn_message = undef } - $warnmsg_escaped = regsubst($use_warn_message, "'", "'\\\\''", 'G') + $warnmsg_escaped = regsubst($use_warn_message, '\'', '\'\\\'\'', 'G') $warnflag = $warnmsg_escaped ? { '' => '', default => "-w '${warnmsg_escaped}'" diff --git a/manifests/setup.pp b/manifests/setup.pp index de67164..9f8c403 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -21,8 +21,8 @@ class concat::setup { } $script_name = $::kernel ? { - 'windows' => "concatfragments.rb", - default => "concatfragments.sh" + 'windows' => 'concatfragments.rb', + default => 'concatfragments.sh' } $script_path = "${concatdir}/bin/${script_name}"