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.

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

Add option in file.append to ignore_whitespace. #30156

Merged
merged 1 commit into from Jan 8, 2016

Conversation

Projects
None yet
3 participants
@abednarik
Contributor

abednarik commented Jan 5, 2016

When appending content to a file, salt will try to search for that content first. During this
operation whitespace is ignored. This option allows to override this bahavior.

Fixes #28586.

Show outdated Hide outdated salt/states/file.py Outdated
@abednarik

This comment has been minimized.

Show comment
Hide comment
@abednarik

abednarik Jan 5, 2016

Contributor

Thanks for the patience and help @jfindlay.

Hope now is fine.

Contributor

abednarik commented Jan 5, 2016

Thanks for the patience and help @jfindlay.

Hope now is fine.

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Jan 5, 2016

Contributor

@abednarik, no problem. Thanks for working on this.

Contributor

jfindlay commented Jan 5, 2016

@abednarik, no problem. Thanks for working on this.

Show outdated Hide outdated salt/states/file.py Outdated
@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 6, 2016

Collaborator

One more inline comment. Otherwise this looks great!

Collaborator

basepi commented Jan 6, 2016

One more inline comment. Otherwise this looks great!

Show outdated Hide outdated salt/states/file.py Outdated
@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 6, 2016

Collaborator

Found another issue. Made an inline comment.

Collaborator

basepi commented Jan 6, 2016

Found another issue. Made an inline comment.

@abednarik

This comment has been minimized.

Show comment
Hide comment
@abednarik

abednarik Jan 6, 2016

Contributor

Thanks for your hel and comments. Will work on this.

Cheers
El ene. 6, 2016 2:05 PM, "Colton Myers" notifications@github.com escribió:

Found another issue. Made an inline comment.


Reply to this email directly or view it on GitHub
#30156 (comment).

Contributor

abednarik commented Jan 6, 2016

Thanks for your hel and comments. Will work on this.

Cheers
El ene. 6, 2016 2:05 PM, "Colton Myers" notifications@github.com escribió:

Found another issue. Made an inline comment.


Reply to this email directly or view it on GitHub
#30156 (comment).

@abednarik

This comment has been minimized.

Show comment
Hide comment
@abednarik

abednarik Jan 7, 2016

Contributor

Hi @basepi

Have a look, when you can please. I think this is probably better. I made a few tests and it's working as expected.

Cheers.

Contributor

abednarik commented Jan 7, 2016

Hi @basepi

Have a look, when you can please. I think this is probably better. I made a few tests and it's working as expected.

Cheers.

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 7, 2016

Collaborator

Perfect, I like the change. Could you glance at the one last comment I left? Just about clarity in the documentation.

Collaborator

basepi commented Jan 7, 2016

Perfect, I like the change. Could you glance at the one last comment I left? Just about clarity in the documentation.

@abednarik

This comment has been minimized.

Show comment
Hide comment
@abednarik

abednarik Jan 7, 2016

Contributor

Sure thing. Let me finish and fix my horrible mistake #30204
and I will be back here.

Contributor

abednarik commented Jan 7, 2016

Sure thing. Let me finish and fix my horrible mistake #30204
and I will be back here.

Add option in file.append to ignore_whitespace.
When appending content to a file, salt will try to search for that content first. During this
operation whitespace is ignored. This option allows to override this bahavior.

Fixes #28586.
@abednarik

This comment has been minimized.

Show comment
Hide comment
@abednarik

abednarik Jan 7, 2016

Contributor

@basepi Hope is better now.

Contributor

abednarik commented Jan 7, 2016

@basepi Hope is better now.

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 8, 2016

Collaborator

Perfect, thanks for doing that!

Collaborator

basepi commented Jan 8, 2016

Perfect, thanks for doing that!

basepi added a commit that referenced this pull request Jan 8, 2016

Merge pull request #30156 from abednarik/ignore_whitespace_file_append
Add option in file.append to ignore_whitespace.

@basepi basepi merged commit 1256fd1 into saltstack:2015.8 Jan 8, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11140 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8634 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12553 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12252 — SUCCESS
Details

@abednarik abednarik deleted the abednarik:ignore_whitespace_file_append branch Jan 8, 2016

@cachedout cachedout referenced this pull request Jan 11, 2016

Merged

Fix file.append logic #30282

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment