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

Grains return wrong OS version and other OS related values for Oracle Linux #29435

Merged
merged 2 commits into from Dec 5, 2015

Conversation

Projects
None yet
3 participants
@galet

galet commented Dec 4, 2015

OEL contains space characters at the end of some lines. The current regular expression doesn't expect that. This causes various issues especially for "service" module which doesn't work on OEL.

Fixes Issue #29425

Galet, Michal
Grains return wrong OS version and other OS related values for Oracle…
… Linux

OEL contains space characters at the end of some lines. The current regular expression doesn't expect that. This causes various issues especially for "service" module which doesn't work on OEL.

@galet galet changed the title from Grains return wrong OS version and other OS related values for Oracle… to Grains return wrong OS version and other OS related values for Oracle Linux Dec 4, 2015

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Dec 4, 2015

Collaborator

Right here you're just matching the whitespace. Should we also strip it? Currently we only strip the newline at the end.

Collaborator

basepi commented Dec 4, 2015

Right here you're just matching the whitespace. Should we also strip it? Currently we only strip the newline at the end.

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Dec 4, 2015

Collaborator

Actually, I wonder if instead of changing the regex, we should just add the space character to the line.strip.....

Collaborator

basepi commented Dec 4, 2015

Actually, I wonder if instead of changing the regex, we should just add the space character to the line.strip.....

@galet

This comment has been minimized.

Show comment
Hide comment
@galet

galet Dec 4, 2015

You are right, that would be better.

galet commented Dec 4, 2015

You are right, that would be better.

Galet, Michal
Grains return wrong OS version and other OS related values for Oracle…
… Linux

Updating based on feedback - strip all whitespace characters instead of updating the regex
@galet

This comment has been minimized.

Show comment
Hide comment
@galet

galet Dec 4, 2015

Actually the strip without any arguments will strip all whitespace characters which would be better IMHO.

galet commented Dec 4, 2015

Actually the strip without any arguments will strip all whitespace characters which would be better IMHO.

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Dec 5, 2015

Contributor

Thanks, @galet.

Contributor

jfindlay commented Dec 5, 2015

Thanks, @galet.

jfindlay added a commit that referenced this pull request Dec 5, 2015

Merge pull request #29435 from galet/2015.8
Grains return wrong OS version and other OS related values for Oracle Linux

@jfindlay jfindlay merged commit 129f45f into saltstack:2015.8 Dec 5, 2015

4 of 6 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #486 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11779 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2843 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11484 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10312 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment