(FACT-1246) Return the first value found in ID_LIKE #1226
Merged
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
|
👍 Everything looks good to me |
|
👍 @kylog should we adopt this for the next sprint? |
| @@ -57,7 +57,17 @@ namespace facter { namespace facts { namespace linux { | |||
| return value; | |||
| } | |||
| auto val = _release_info.find("ID_LIKE"); | |||
| return (val != _release_info.end()) ? val->second : std::string(); | |||
| if (val != _release_info.end()) { | |||
| auto family = val->second; | |||
There was a problem hiding this comment.
Nit pick: this makes a copy of the string, which is fine when it doesn't contain a space (we were copying it when returning it anyway), but in the case where it does contain a space, the copy doesn't need to be made.
Using auto& family = val->second; (note the &) creates a reference to the value, which we'll only copy if it doesn't contain a space.
|
Other than the above nit picks, this looks good to merge to me. |
The ID_LIKE field may contain a space-separated list of related OS families. Some Cisco platforms exercise this feature, and when they do so, we only want to return the first value found.
|
@peterhuene thanks for the review - I've made changes to the code based on your feedback. Should be good to go now. |
peterhuene
added a commit
that referenced
this pull request
Nov 20, 2015
(FACT-1246) Return the first value found in ID_LIKE
|
👍 Thanks! |
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.
The ID_LIKE field may contain a space-separated list of related OS
families. Some Cisco platforms exercise this feature, and when they
do so, we only want to return the first value found.
Tested on the cisco-wrlinux-7 platform with the following release file contents:
/etc/os-release:
ID=wrlinux
NAME=Wind River Linux
VERSION=7.0.0.2
VERSION_ID=7.0.0.2
PRETTY_NAME=Wind River Linux 7.0.0.2
CISCO_RELEASE_INFO=/etc/cisco-release
/etc/cisco-release:
ID=ios_xr
ID_LIKE="cisco-wrlinux wrlinux"
NAME=IOS XR
VERSION="6.0.0.20I"
VERSION_ID=6.0.0.20I
PRETTY_NAME="Cisco IOS XR Software, Version 6.0.0.20I"
HOME_URL=http://www.cisco.com
BUILD_ID="2015-10-22-18-52-49"
CISCO_RELEASE_INFO=/etc/cisco-release
This is the first time I've touched C++ code in years, so please be thorough when explaining any desired refactorings.