cvmfs: use PKG_VERSION_xxx to test pkg_compare_version() return values #90
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
|
Have you tested that the results are identical? |
jrha
reviewed
Nov 22, 2016
| if ((pkg_compare_version(CVMFS_CLIENT_VERSION, '2.1.20') >= 0) && (OS_VERSION_PARAMS['major'] != 'sl5')) { | ||
| SELF[escape('cvmfs-config-default')] = dict(); | ||
| } else { | ||
| if ((pkg_compare_version(CVMFS_CLIENT_VERSION, '2.1.20') == PKG_VERSION_LESS) || (OS_VERSION_PARAMS['major'] == 'sl5')) { |
There was a problem hiding this comment.
This is not equivalent to the previous code, is it what was intended?
There was a problem hiding this comment.
Yes it is (it should)! I inverted the test due to the problem described in quattor/template-library-core#132. Before the test was pkg_compare_version <= 0 which meant (if I am right) greater or equal. I swaped the if conditions and thus test for less.
|
Yes it has been tested at GRIF and I saw no difference (as expected). |
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.
Requires quattor/template-library-core#131 first... But would be good to merge it at the same time.