Skip to content

Commit

Permalink
updates init.pp to pass linting
Browse files Browse the repository at this point in the history
  • Loading branch information
bmjen committed Jun 1, 2015
1 parent abf40f0 commit d4376cb
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -118,6 +119,7 @@
$warn_message = $warn
}
}
# lint:endignore

$warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G')
$warnflag = $warnmsg_escaped ? {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -243,7 +245,7 @@

$absent_exec_command = $::kernel ? {
'windows' => 'cmd.exe /c exit 0',
default => 'true',
default => true,
}

$absent_exec_path = $::kernel ? {
Expand Down

0 comments on commit d4376cb

Please sign in to comment.