Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[2.10] ansible-doc: include collection name in text output / plugin loader: return collection name; ansible-doc: handle ansible.builtin correctly #70572

Merged
merged 2 commits into from
Jul 17, 2020
Merged

[2.10] ansible-doc: include collection name in text output / plugin loader: return collection name; ansible-doc: handle ansible.builtin correctly #70572

merged 2 commits into from
Jul 17, 2020

Conversation

felixfontein
Copy link
Contributor

@felixfontein felixfontein commented Jul 10, 2020 •
edited
Loading

SUMMARY

Backports of #70401 and #70026 to stable-2.10.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ansible-doc
plugin loader

@felixfontein
ansible-doc: include collection name in text output (ansible#70401)
2958916 
* ansible-doc: include collection name in text output

* Be more careful to not accidentally pass ansible.builtin for user-supplied modules.

(cherry picked from commit f4c89ea)
@ansibot ansibot added affects_2.10 This issue/PR affects Ansible v2.10 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Jul 10, 2020
@felixfontein
plugin loader: return collection name; ansible-doc: handle ansible.bu…
7ba1ba2 
…iltin correctly (ansible#70026)

* Determine collection in plugin loader.

* Fix test.

* Use PluginPathContext objects in PluginLoader._plugin_path_cache instead of tuples.

(cherry picked from commit 24dcaf8)
@felixfontein felixfontein changed the title [2.10] ansible-doc: include collection name in text output [2.10] ansible-doc: include collection name in text output / plugin loader: return collection name; ansible-doc: handle ansible.builtin correctly Jul 10, 2020
@felixfontein
Copy link
Contributor Author

The backport of #70026 depends on the backport of #70401, that's why they are both in this PR.

CC @nitzmahone

@nitzmahone nitzmahone merged commit 15355ed into ansible:stable-2.10 Jul 17, 2020
@felixfontein felixfontein deleted the backport/2.10/70401 branch July 17, 2020 20:53
@felixfontein
Copy link
Contributor Author

@nitzmahone thanks for the remaining three backports!

@sivel sivel removed the needs_triage Needs a first human triage before being processed. label Jul 21, 2020
@ansible ansible locked and limited conversation to collaborators Aug 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
affects_2.10 This issue/PR affects Ansible v2.10 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@felixfontein @sivel @ansibot @nitzmahone