diff options
| author | Sloane Hertel <19572925+s-hertel@users.noreply.github.com> | 2023-01-26 14:15:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-26 11:15:18 -0800 |
| commit | 321848e98d9e565ee3f78c8c37ca879a8e3c55c1 (patch) | |
| tree | 4ac0eca1c3c96544378e9edae444746da8ba0b69 /lib/ansible/galaxy | |
| parent | 52d3d39ffcd797bb3167ab038148db815493d2a7 (diff) | |
| download | ansible-321848e98d9e565ee3f78c8c37ca879a8e3c55c1.tar.gz | |
fix installing collections from git repos that contain MANIFEST.json (#79808)
* add null 'manifest' key to metadata for git repo collections containing MANIFEST.json
changelog
* set to Sentinel instead of None
* Test installing a collection in a git repo that contains a MANIFEST.json
* fix test
* Update changelogs/fragments/ansible-galaxy-install-git-src-manifest.yml
Diffstat (limited to 'lib/ansible/galaxy')
| -rw-r--r-- | lib/ansible/galaxy/collection/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ansible/galaxy/collection/__init__.py b/lib/ansible/galaxy/collection/__init__.py index aeb73e84b1..5a3928f88d 100644 --- a/lib/ansible/galaxy/collection/__init__.py +++ b/lib/ansible/galaxy/collection/__init__.py @@ -1625,6 +1625,7 @@ def install_src(collection, b_collection_path, b_collection_output_path, artifac if 'build_ignore' not in collection_meta: # installed collection, not src # FIXME: optimize this? use a different process? copy instead of build? collection_meta['build_ignore'] = [] + collection_meta['manifest'] = Sentinel collection_manifest = _build_manifest(**collection_meta) file_manifest = _build_files_manifest( b_collection_path, |