opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #206 from notanisp/master

Browse source 
Fix errors with the future parser.
This commit is contained in:
Joshua Hoblitt 2014-07-10 23:16:29 -07:00
commit 07bba0bcad
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manifests/fragment.pp
View file

@ -56,12 +56,12 @@ define concat::fragment(
warning('The $backup parameter to concat::fragment is deprecated and has no effect') warning('The $backup parameter to concat::fragment is deprecated and has no effect')
} }
if $ensure == undef { if $ensure == undef {
$_ensure = getparam(Concat[$target], 'ensure') $my_ensure = getparam(Concat[$target], 'ensure')
} else { } else {
if ! ($ensure in [ 'present', 'absent' ]) { if ! ($ensure in [ 'present', 'absent' ]) {
warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated. If you want to use the content of a file as a fragment please use the $source parameter.') warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated. If you want to use the content of a file as a fragment please use the $source parameter.')
} }
$_ensure = $ensure $my_ensure = $ensure
} }
include concat::setup include concat::setup
@ -80,18 +80,18 @@ define concat::fragment(
# be paranoid and only allow the fragment's file resource's ensure param to # be paranoid and only allow the fragment's file resource's ensure param to
# be file, absent, or a file target # be file, absent, or a file target
$safe_ensure = $_ensure ? { $safe_ensure = $my_ensure ? {
'' => 'file', '' => 'file',
undef => 'file', undef => 'file',
'file' => 'file', 'file' => 'file',
'present' => 'file', 'present' => 'file',
'absent' => 'absent', 'absent' => 'absent',
default => $_ensure, default => $my_ensure,
} }
# if it looks line ensure => /target syntax was used, fish that out # if it looks line ensure => /target syntax was used, fish that out
if ! ($_ensure in ['', 'present', 'absent', 'file' ]) { if ! ($my_ensure in ['', 'present', 'absent', 'file' ]) {
$ensure_target = $_ensure $ensure_target = $my_ensure
} else { } else {
$ensure_target = undef $ensure_target = undef
} }