Skip to content

Commit b0c874b

Browse files
author
Morgan Haskel
committed
Merge pull request #323 from bmjen/update-readme
update README with correct behavior for fragment parameter
2 parents 2d5734c + d4376cb commit b0c874b

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Specifies a file to read into the content of the fragment. **Note**: You must su
218218

219219
#####`target`
220220

221-
*Required.* Specifies the destination file of the fragment. Valid options: a string containing an absolute path.
221+
*Required.* Specifies the destination file of the fragment. Valid options: a string containing the title of the parent `concat` resource.
222222

223223
###Deprecations
224224

@@ -280,4 +280,4 @@ For more information, see our [module contribution guide.](https://docs.puppetla
280280

281281
###Contributors
282282

283-
To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors)
283+
To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors)

manifests/init.pp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
$default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
100100
$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'
101101

102+
# lint:ignore:quoted_booleans
102103
case $warn {
103104
true: {
104105
$warn_message = $default_warn_message
@@ -118,6 +119,7 @@
118119
$warn_message = $warn
119120
}
120121
}
122+
# lint:endignore
121123

122124
$warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G')
123125
$warnflag = $warnmsg_escaped ? {
@@ -177,15 +179,15 @@
177179
}
178180

179181
file { $name:
180-
ensure => present,
181-
owner => $owner,
182-
group => $group,
183-
mode => $mode,
184-
replace => $replace,
185-
path => $path,
186-
alias => "concat_${name}",
187-
source => "${fragdir}/${concat_name}",
188-
backup => $backup,
182+
ensure => present,
183+
owner => $owner,
184+
group => $group,
185+
mode => $mode,
186+
replace => $replace,
187+
path => $path,
188+
alias => "concat_${name}",
189+
source => "${fragdir}/${concat_name}",
190+
backup => $backup,
189191
}
190192

191193
# Only newer versions of puppet 3.x support the validate_cmd parameter
@@ -243,7 +245,7 @@
243245

244246
$absent_exec_command = $::kernel ? {
245247
'windows' => 'cmd.exe /c exit 0',
246-
default => 'true',
248+
default => true,
247249
}
248250

249251
$absent_exec_path = $::kernel ? {

0 commit comments

Comments
 (0)