diff options
| author | Jordan Borean <jborean93@gmail.com> | 2022-01-19 11:09:59 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 17:09:59 -0800 |
| commit | d579286e2d0aeb70f41b05f43ea0ad5d54d278e5 (patch) | |
| tree | 15e6b89e740378d7a96c8c261f516cdbbe7da581 | |
| parent | 8519c3ecdd39ebe210129abb1ad70b62fbb7380c (diff) | |
| download | ansible-d579286e2d0aeb70f41b05f43ea0ad5d54d278e5.tar.gz | |
galaxy build - ignore existing MANIFEST and FILES (#76479) (#76498)
(cherry picked from commit 8482ee4e9a992abe998c7f885ef5e873f9ef5894)
| -rw-r--r-- | changelogs/fragments/galaxy-build-files-ignore.yml | 4 | ||||
| -rw-r--r-- | lib/ansible/galaxy/collection.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/fragments/galaxy-build-files-ignore.yml b/changelogs/fragments/galaxy-build-files-ignore.yml new file mode 100644 index 0000000000..983307e0ce --- /dev/null +++ b/changelogs/fragments/galaxy-build-files-ignore.yml @@ -0,0 +1,4 @@ +bugfixes: +- >- + ansible-galaxy collection build - Ignore any existing ``MANIFEST.json`` and ``FILES.json`` in the root directory + when building a collection. diff --git a/lib/ansible/galaxy/collection.py b/lib/ansible/galaxy/collection.py index 054a8a57b5..3ef71172c5 100644 --- a/lib/ansible/galaxy/collection.py +++ b/lib/ansible/galaxy/collection.py @@ -931,6 +931,8 @@ def _build_files_manifest(b_collection_path, namespace, name, ignore_patterns): # We always ignore .pyc and .retry files as well as some well known version control directories. The ignore # patterns can be extended by the build_ignore key in galaxy.yml b_ignore_patterns = [ + b'MANIFEST.json', + b'FILES.json', b'galaxy.yml', b'galaxy.yaml', b'.git', |