Isbm osfinger ubuntu fix #35227
Merged
Isbm osfinger ubuntu fix #35227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -1372,8 +1372,7 @@ def os_data(): | |||
| grains.pop('lsb_distrib_release', None) | |||
| grains['osrelease'] = \ | |||
| grains.get('lsb_distrib_release', osrelease).strip() | |||
| grains['oscodename'] = grains.get('lsb_distrib_codename', | |||
| oscodename).strip() | |||
| grains['oscodename'] = grains.get('lsb_distrib_codename', '').strip() or oscodename | |||
There was a problem hiding this comment.
Because it says before "if there is no lsb_distrib_codename, use oscodename, then .strip() everything". Which is failing, in case lsb_distrib_codename contains an empty data. In this case you are happily getting an empty string, while you already have a correct codename from the platform.linux_distribution which is set to the oscodename variable.
Hope it explains.
added 2 commits
August 5, 2016 13:20
|
@cachedout this fixes the issue and is checked. Just a reminder. 😉 |
|
It's on my list. :] I'll likely get to it today. Thanks for the bump, @isbm |
rallytime
pushed a commit
to rallytime/salt
that referenced
this pull request
Aug 11, 2016
Refs saltstack#35227 These tests will need to be changed back to integers once Nitrogen is released.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Bugfix PR.
What issues does this PR fix or reference?
oscodenamehas not been taken properly from the platform modulePrevious Behavior
The
osfingergrain for Ubuntu systems has been returning only name and major release included, resulting to e.g.Ubuntu-16instead of expectedUbuntu-16.04orUbuntu-16.10.New Behavior
The
osfingergrain for Ubuntu is now reported with a minor version included. Example:Tests written?
Yes
Cc: @nmadhok please take a look