cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove incorrect changelog (#72682)

Browse source 
* also remove offending code
This commit is contained in:
Sloane Hertel 2020-11-30 11:02:26 -05:00 committed by GitHub
parent 581337a6d5
commit 8bdda8792d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/changelog.yaml
View file

@ -802,7 +802,6 @@ releases:
- ansible-galaxy - Requirement entries for collections now support a 'type' - ansible-galaxy - Requirement entries for collections now support a 'type'
key to indicate whether the collection is a galaxy artifact, file, url, or key to indicate whether the collection is a galaxy artifact, file, url, or
git repo. 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`` - ansible-galaxy - add ``--token`` argument which is the same as ``--api-key``
(https://github.com/ansible/ansible/issues/65955) (https://github.com/ansible/ansible/issues/65955)
- ansible-galaxy - add ``collection list`` command for listing installed collections - ansible-galaxy - add ``collection list`` command for listing installed collections

1
changelogs/fragments/69154-install-collection-from-git-repo.yml
View file

@ -1,4 +1,3 @@
minor_changes: minor_changes:
- ansible-galaxy - Allow installing collections from git repositories. - 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 - 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.

8
lib/ansible/galaxy/collection.py
View file

@ -1548,10 +1548,4 @@ def _consume_file(read_from, write_to=None):
def get_galaxy_metadata_path(b_path): def get_galaxy_metadata_path(b_path):
b_default_path = os.path.join(b_path, b'galaxy.yml') return 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