fix minor issues with debug and item labels #41331
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
ansibot
added
affects_2.7
ansibot
added
the
needs_revision
ansibot
removed
the
needs_revision
sivel
reviewed
Jun 15, 2018
| return item | ||
|
|
||
| def _get_item(self, result): | ||
| ''' here for backwards compat, really should have always been named: ''' | ||
| self._display.deprecated("This callback should be updated to use the _get_item_label method instead", version="2.11") |
There was a problem hiding this comment.
Can we do better than "This callback"?
There was a problem hiding this comment.
only for v2 ones, older ones are not guaranteed to have name
There was a problem hiding this comment.
We could fall back to __file__ or something in that case at minimum. Could be useful to include that regardless.
sivel
reviewed
Jun 15, 2018
| for key in list(result.keys()): | ||
| if key.startswith('_'): | ||
| continue # but leave 'control keys' in | ||
| if key != 'msg': |
There was a problem hiding this comment.
These 2 if statements could probably be combined. To pop when if it doesn't start with _ or not equal to msg.
- no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item
ansibot
added
the
needs_revision
agaffney
reviewed
Jun 16, 2018
| return item | ||
|
|
||
| def _get_item(self, result): | ||
| ''' here for backwards compat, really should have always been named: ''' |
There was a problem hiding this comment.
It seems like this comment is missing a _get_item_label at the end, unless that colon implies that it should be inferred from reading the code below it.
| label = self._task.loop_control.label | ||
|
|
||
| # ensure we always have a label | ||
| if not label: |
There was a problem hiding this comment.
This should probably be if label is None:, as the above would be triggered by doing label: false (even though it's somewhat non-sensical).
|
I'm not entirely sure what this is actually fixing, but it looks good in general |
ansibot
removed
the
needs_revision
bcoca
added a commit
to bcoca/ansible
that referenced
this pull request
Jun 21, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item (cherry picked from commit 27c43da)
bcoca
added a commit
to bcoca/ansible
that referenced
this pull request
Jun 21, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item (cherry picked from commit 27c43da)
mattclay
pushed a commit
that referenced
this pull request
Jun 21, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item (cherry picked from commit 27c43da)
jacum
pushed a commit
to jacum/ansible
that referenced
this pull request
Jun 26, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item
kbreit
pushed a commit
to kbreit/ansible
that referenced
this pull request
Jul 3, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item (cherry picked from commit 27c43da)
nitzmahone
pushed a commit
that referenced
this pull request
Jul 3, 2018
* fix minor issues with debug and item labels - no more `item=None`, we always have a label now - debug should only show expected information, either msg= or the var in var= - also fixed method name, deprecated misleading _get_item (cherry picked from commit 27c43da)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
item=None, we always have a label nowfixes #41571
ISSUE TYPE
COMPONENT NAME
callbacks
ANSIBLE VERSION