Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MODULES-2080) Call out changed behaviour of 'warn' parameter #320

Merged
merged 1 commit into from
May 29, 2015
Merged

(MODULES-2080) Call out changed behaviour of 'warn' parameter #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,13 @@ Specifies whether to add a header message at the top of the destination file. Va
If you set 'warn' to 'true', `concat` adds the following message:

~~~
# This file is managed by Puppet. DO NOT EDIT.
# This file is managed by Puppet. DO NOT EDIT.\n
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not really sure how useful the \n here is in the README…

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to note the fact that this string is copied verbatim to the file. I could leave off the \n and instead s/following message/following line/ in the paragraph above?

On 29 May 2015, at 17:18, Igor Galić [email protected] wrote:

In README.md #320 (comment):

@@ -183,9 +183,13 @@ Specifies whether to add a header message at the top of the destination file. Va
If you set 'warn' to 'true', concat adds the following message:

-# This file is managed by Puppet. DO NOT EDIT.
+# This file is managed by Puppet. DO NOT EDIT.\n
not really sure how useful the \n here is in the README…

—
Reply to this email directly or view it on GitHub https://github.com/puppetlabs/puppetlabs-concat/pull/320/files#r31339621.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nod

~~~

Before 2.0.0, this parameter would add a newline at the end of the warn
message. To improve flexibilty, this was removed. Please add it explicitely if
you need it.

####Define: `concat::fragment`

Except where noted, all the below parameters are optional.
Expand Down
5 changes: 4 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
# The mode of the final file
# [*warn*]
# Adds a normal shell style comment top of the file indicating that it is
# built by puppet
# built by puppet.
# Before 2.0.0, this parameter would add a newline at the end of the warn
# message. To improve flexibilty, this was removed. Please add it explicitely
# if you need it.
# [*backup*]
# Controls the filebucketing behavior of the final file and see File type
# reference for its use. Defaults to 'puppet'
Expand Down