From b0dcf0d164dd712b56b826d6444c29a2b61f14a9 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 1 Jun 2021 09:44:01 +0530 Subject: [PATCH] collection: match skip message as per role install (#74861) --- changelogs/fragments/67943_collection_skip.yml | 3 +++ lib/ansible/galaxy/collection/__init__.py | 4 ++-- .../targets/ansible-galaxy-collection/tasks/upgrade.yml | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/67943_collection_skip.yml diff --git a/changelogs/fragments/67943_collection_skip.yml b/changelogs/fragments/67943_collection_skip.yml new file mode 100644 index 00000000000..e4e267b57c7 --- /dev/null +++ b/changelogs/fragments/67943_collection_skip.yml @@ -0,0 +1,3 @@ +--- +minor_changes: +- collection - match skip message as per role installation. diff --git a/lib/ansible/galaxy/collection/__init__.py b/lib/ansible/galaxy/collection/__init__.py index f13f5e4159e..9af3068c8e8 100644 --- a/lib/ansible/galaxy/collection/__init__.py +++ b/lib/ansible/galaxy/collection/__init__.py @@ -523,14 +523,14 @@ def install_collections( for fqcn, concrete_coll_pin in dependency_map.items(): if concrete_coll_pin.is_virtual: display.vvvv( - "Skipping '{coll!s}' as it is virtual". + "'{coll!s}' is virtual, skipping.". format(coll=to_text(concrete_coll_pin)), ) continue if concrete_coll_pin in preferred_collections: display.display( - "Skipping '{coll!s}' as it is already installed". + "'{coll!s}' is already installed, skipping.". format(coll=to_text(concrete_coll_pin)), ) continue diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/upgrade.yml b/test/integration/targets/ansible-galaxy-collection/tasks/upgrade.yml index b49f1eec37e..893ea8033b5 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/upgrade.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/upgrade.yml @@ -124,9 +124,9 @@ that: - '"parent_dep.parent_collection:1.1.0 was installed successfully" in result.stdout_lines' - (metadata.results[0].content | b64decode | from_json).collection_info.version == '1.1.0' - - "\"Skipping 'child_dep.child_collection:0.9.9' as it is already installed\" in result.stdout_lines" + - "\"'child_dep.child_collection:0.9.9' is already installed, skipping.\" in result.stdout_lines" - (metadata.results[1].content | b64decode | from_json).collection_info.version == '0.9.9' - - "\"Skipping 'child_dep.child_dep2:1.2.2' as it is already installed\" in result.stdout_lines" + - "\"'child_dep.child_dep2:1.2.2' is already installed, skipping.\" in result.stdout_lines" - (metadata.results[2].content | b64decode | from_json).collection_info.version == '1.2.2' ##### Updating collections with --upgrade @@ -187,7 +187,7 @@ register: result - assert: - that: "\"Skipping 'namespace1.name1:1.1.0-beta.1' as it is already installed\" in result.stdout" + that: "\"'namespace1.name1:1.1.0-beta.1' is already installed, skipping.\" in result.stdout" # With deps