From 8bdda8792df622b3bdb78c7dcebcda16f4ad8ef3 Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:02:26 -0500 Subject: [PATCH] Remove incorrect changelog (#72682) * also remove offending code --- changelogs/changelog.yaml | 1 - .../fragments/69154-install-collection-from-git-repo.yml | 1 - lib/ansible/galaxy/collection.py | 8 +------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 29be6b3edc0..4b1ea8e59d4 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -802,7 +802,6 @@ releases: - ansible-galaxy - Requirement entries for collections now support a 'type' key to indicate whether the collection is a galaxy artifact, file, url, or git repo. - - ansible-galaxy - Support both 'galaxy.yml' and 'galaxy.yaml' files for collections. - ansible-galaxy - add ``--token`` argument which is the same as ``--api-key`` (https://github.com/ansible/ansible/issues/65955) - ansible-galaxy - add ``collection list`` command for listing installed collections diff --git a/changelogs/fragments/69154-install-collection-from-git-repo.yml b/changelogs/fragments/69154-install-collection-from-git-repo.yml index e0e5a7385df..08e9e03ec0b 100644 --- a/changelogs/fragments/69154-install-collection-from-git-repo.yml +++ b/changelogs/fragments/69154-install-collection-from-git-repo.yml @@ -1,4 +1,3 @@ minor_changes: - ansible-galaxy - Allow installing collections from git repositories. - ansible-galaxy - Requirement entries for collections now support a 'type' key to indicate whether the collection is a galaxy artifact, file, url, or git repo. - - ansible-galaxy - Support both 'galaxy.yml' and 'galaxy.yaml' files for collections. diff --git a/lib/ansible/galaxy/collection.py b/lib/ansible/galaxy/collection.py index eae0f389062..2c03db5cc30 100644 --- a/lib/ansible/galaxy/collection.py +++ b/lib/ansible/galaxy/collection.py @@ -1548,10 +1548,4 @@ def _consume_file(read_from, write_to=None): def get_galaxy_metadata_path(b_path): - b_default_path = os.path.join(b_path, b'galaxy.yml') - candidate_names = [b'galaxy.yml', b'galaxy.yaml'] - for b_name in candidate_names: - b_path = os.path.join(b_path, b_name) - if os.path.exists(b_path): - return b_path - return b_default_path + return os.path.join(b_path, b'galaxy.yml')