From 4e093d7eb64ccd94406ede935bafb7996918297a Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Wed, 29 Apr 2020 18:48:59 +0800 Subject: [PATCH 1/2] enhance the ability to filter extension's dist-info --- src/azure-cli-core/azure/cli/core/extension/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/extension/__init__.py b/src/azure-cli-core/azure/cli/core/extension/__init__.py index a402d57369b..932b48514c2 100644 --- a/src/azure-cli-core/azure/cli/core/extension/__init__.py +++ b/src/azure-cli-core/azure/cli/core/extension/__init__.py @@ -138,7 +138,7 @@ def get_metadata(self): return None metadata = {} ext_dir = self.path or get_extension_path(self.name) - info_dirs = glob(os.path.join(ext_dir, self.name.replace('-', '_') + '*.*-info')) + info_dirs = glob(os.path.join(ext_dir, self.name.replace('-', '_') + '-' + '*.dist-info')) azext_metadata = WheelExtension.get_azext_metadata(ext_dir) if azext_metadata: From 45d84224b6fcf1cdf432112edde124cffb63d3aa Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Wed, 29 Apr 2020 19:21:08 +0800 Subject: [PATCH 2/2] add more fix --- src/azure-cli-core/azure/cli/core/extension/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/extension/__init__.py b/src/azure-cli-core/azure/cli/core/extension/__init__.py index 932b48514c2..4104f77040e 100644 --- a/src/azure-cli-core/azure/cli/core/extension/__init__.py +++ b/src/azure-cli-core/azure/cli/core/extension/__init__.py @@ -177,13 +177,13 @@ def get_all(): if os.path.isdir(EXTENSIONS_DIR): for ext_name in os.listdir(EXTENSIONS_DIR): ext_path = os.path.join(EXTENSIONS_DIR, ext_name) - pattern = os.path.join(ext_path, '*.*-info') + pattern = os.path.join(ext_path, '*.dist-info') if os.path.isdir(ext_path) and glob(pattern): exts.append(WheelExtension(ext_name, ext_path)) if os.path.isdir(EXTENSIONS_SYS_DIR): for ext_name in os.listdir(EXTENSIONS_SYS_DIR): ext_path = os.path.join(EXTENSIONS_SYS_DIR, ext_name) - pattern = os.path.join(ext_path, '*.*-info') + pattern = os.path.join(ext_path, '*.dist-info') if os.path.isdir(ext_path) and glob(pattern): ext = WheelExtension(ext_name, ext_path) if ext not in exts: