From 6bc1e9f5dd98ec4e700015ee91c08f4ce82831fe Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Tue, 8 Dec 2020 12:22:55 -0600
Subject: [PATCH] Address additional ansible_core rename issues (#72906)

* Update __requires__ to reference the correct ansible_core package name

* ansible-test updates to handle the correct egg_info for ansible_core
---
 lib/ansible/cli/scripts/ansible_cli_stub.py                   | 2 +-
 lib/ansible/cli/scripts/ansible_connection_cli_stub.py        | 2 +-
 test/lib/ansible_test/_internal/executor.py                   | 4 ++--
 .../lib/ansible_test/_internal/provider/source/unversioned.py | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/ansible/cli/scripts/ansible_cli_stub.py b/lib/ansible/cli/scripts/ansible_cli_stub.py
index bce95c85caa..f82c47b741d 100755
--- a/lib/ansible/cli/scripts/ansible_cli_stub.py
+++ b/lib/ansible/cli/scripts/ansible_cli_stub.py
@@ -22,7 +22,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__requires__ = ['ansible_base']
+__requires__ = ['ansible_core']
 
 
 import errno
diff --git a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py
index d701f15696b..1b85c1c34a6 100755
--- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py
+++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py
@@ -4,7 +4,7 @@
 from __future__ import (absolute_import, division, print_function)
 
 __metaclass__ = type
-__requires__ = ['ansible_base']
+__requires__ = ['ansible_core']
 
 
 import fcntl
diff --git a/test/lib/ansible_test/_internal/executor.py b/test/lib/ansible_test/_internal/executor.py
index d452b1ac52b..43fa0d82bca 100644
--- a/test/lib/ansible_test/_internal/executor.py
+++ b/test/lib/ansible_test/_internal/executor.py
@@ -392,12 +392,12 @@ def generate_egg_info(args):
 
     # inclusion of the version number in the path is optional
     # see: https://setuptools.readthedocs.io/en/latest/formats.html#filename-embedded-metadata
-    egg_info_path = ANSIBLE_LIB_ROOT + '_base-%s.egg-info' % ansible_version
+    egg_info_path = ANSIBLE_LIB_ROOT + '_core-%s.egg-info' % ansible_version
 
     if os.path.exists(egg_info_path):
         return
 
-    egg_info_path = ANSIBLE_LIB_ROOT + '_base.egg-info'
+    egg_info_path = ANSIBLE_LIB_ROOT + '_core.egg-info'
 
     if os.path.exists(egg_info_path):
         return
diff --git a/test/lib/ansible_test/_internal/provider/source/unversioned.py b/test/lib/ansible_test/_internal/provider/source/unversioned.py
index 09105789caa..cb35fe3d9a5 100644
--- a/test/lib/ansible_test/_internal/provider/source/unversioned.py
+++ b/test/lib/ansible_test/_internal/provider/source/unversioned.py
@@ -38,6 +38,7 @@ class UnversionedSource(SourceProvider):
             '__pycache__',
             'ansible.egg-info',
             'ansible_base.egg-info',
+            'ansible_core.egg-info',
         )
 
         kill_sub_dir = {