diff options
| author | Sloane Hertel <19572925+s-hertel@users.noreply.github.com> | 2023-04-18 13:02:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 12:02:13 -0500 |
| commit | 4de262300bf23f049204e616f163a11cb282edcb (patch) | |
| tree | 7247ab5856cbc679eab181d13111022dfc4c040b | |
| parent | 2c35d46298f75098302eb9d49e943ac01cc9a7f5 (diff) | |
| download | ansible-4de262300bf23f049204e616f163a11cb282edcb.tar.gz | |
ansible-galaxy - fix installing dir sources with a trailing path separator (#79110) (#80540)
* strip trailing path separator from type=dir sources
(cherry picked from commit 964e678a7fa3b0745f9302e7a3682851089d09d2)
3 files changed, 10 insertions, 1 deletions
diff --git a/changelogs/fragments/a-g-col-install-directory-with-trailing-sep.yml b/changelogs/fragments/a-g-col-install-directory-with-trailing-sep.yml new file mode 100644 index 0000000000..be766414ed --- /dev/null +++ b/changelogs/fragments/a-g-col-install-directory-with-trailing-sep.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-galaxy - fix installing collections from directories that have a trailing path separator (https://github.com/ansible/ansible/issues/77803). diff --git a/lib/ansible/galaxy/dependency_resolution/dataclasses.py b/lib/ansible/galaxy/dependency_resolution/dataclasses.py index 2299ea5edf..0a3f8429a4 100644 --- a/lib/ansible/galaxy/dependency_resolution/dataclasses.py +++ b/lib/ansible/galaxy/dependency_resolution/dataclasses.py @@ -211,6 +211,8 @@ class _ComputedReqKindsMixin: @classmethod def from_dir_path(cls, dir_path, art_mgr): """Make collection from an directory with metadata.""" + if dir_path.endswith(to_bytes(os.path.sep)): + dir_path = dir_path.rstrip(to_bytes(os.path.sep)) b_dir_path = to_bytes(dir_path, errors='surrogate_or_strict') if not _is_collection_dir(b_dir_path): display.warning( @@ -261,6 +263,8 @@ class _ComputedReqKindsMixin: regardless of whether any of known metadata files are present. """ # There is no metadata, but it isn't required for a functional collection. Determine the namespace.name from the path. + if dir_path.endswith(to_bytes(os.path.sep)): + dir_path = dir_path.rstrip(to_bytes(os.path.sep)) u_dir_path = to_text(dir_path, errors='surrogate_or_strict') path_list = u_dir_path.split(os.path.sep) req_name = '.'.join(path_list[-2:]) @@ -420,6 +424,9 @@ class _ComputedReqKindsMixin: format(not_url=req_source.api_server), ) + if req_type == 'dir' and req_source.endswith(os.path.sep): + req_source = req_source.rstrip(os.path.sep) + tmp_inst_req = cls(req_name, req_version, req_source, req_type, req_signature_sources) if req_type not in {'galaxy', 'subdirs'} and req_name is None: diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/install.yml b/test/integration/targets/ansible-galaxy-collection/tasks/install.yml index f349d4f6ed..b332308ca2 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/install.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/install.yml @@ -794,7 +794,7 @@ force: yes - name: install symlink_dirs collection from source - command: ansible-galaxy collection install {{ galaxy_dir }}/scratch/symlink_dirs/ + command: ansible-galaxy collection install {{ galaxy_dir }}/scratch/symlink_dirs/symlink_dirs/ environment: ANSIBLE_COLLECTIONS_PATHS: '{{ galaxy_dir }}/ansible_collections' register: install_symlink_dirs |