diff options
| author | Sloane Hertel <19572925+s-hertel@users.noreply.github.com> | 2023-05-09 15:27:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-09 14:27:23 -0500 |
| commit | 594f37dbb406cf56667382bfc91bca84779541d9 (patch) | |
| tree | a8c2df9d766530873e5db3647dc651a0d6f883f6 /lib/ansible/galaxy/collection/__init__.py | |
| parent | 4008335f41d0645a544a6fd9031a1f2a19b6f82a (diff) | |
| download | ansible-594f37dbb406cf56667382bfc91bca84779541d9.tar.gz | |
[ansible-galaxy] Fix installing signed collections (#80661) (#80666)
* Fix installing signed collections by using the fqcn, version, source, and type as a unique identifier.
Define __hash__ and __eq__ methods to handle Candidate/Requirement comparison excluding signatures which aren't fully populated until install time.
* Remove PinnedCandidateRequests since it is redundant now.
* Fix verifying against a signed remote when the keyring isn't configured
(cherry picked from commit d5e2e7a0a8ca9017a091922648430374539f878b)
Diffstat (limited to 'lib/ansible/galaxy/collection/__init__.py')
| -rw-r--r-- | lib/ansible/galaxy/collection/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/galaxy/collection/__init__.py b/lib/ansible/galaxy/collection/__init__.py index d3a76ff92a..2348266507 100644 --- a/lib/ansible/galaxy/collection/__init__.py +++ b/lib/ansible/galaxy/collection/__init__.py @@ -914,7 +914,7 @@ def verify_collections( # NOTE: If there are no Galaxy server signatures, only user-provided signature URLs, # NOTE: those alone validate the MANIFEST.json and the remote collection is not downloaded. # NOTE: The remote MANIFEST.json is only used in verification if there are no signatures. - if not signatures and not collection.signature_sources: + if artifacts_manager.keyring is None or not signatures: api_proxy.get_collection_version_metadata( remote_collection, ) |