From 4f267ff4e8022cd1c8b1c3a86f973f31602e96a0 Mon Sep 17 00:00:00 2001 From: kai ru <69238381+kairu-ms@users.noreply.github.com> Date: Fri, 23 Apr 2021 14:15:31 +0800 Subject: [PATCH 1/2] fix copy vendor sdk issue --- azdev/operations/code_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azdev/operations/code_gen.py b/azdev/operations/code_gen.py index 5beb212ee..6961709e7 100644 --- a/azdev/operations/code_gen.py +++ b/azdev/operations/code_gen.py @@ -124,7 +124,7 @@ def _copy_vendored_sdk(src_path, dest_path): import shutil try: - client_location = find_files(src_path, 'version.py')[0] + client_location = find_files(src_path, '_version.py')[0] except IndexError: raise CLIError('Unable to find client files.') From 6de82db34c2d2e049bdd98f194b1782e7d9c3adc Mon Sep 17 00:00:00 2001 From: kai ru <69238381+kairu-ms@users.noreply.github.com> Date: Sun, 25 Apr 2021 16:15:14 +0800 Subject: [PATCH 2/2] detect both version.py and _version.py --- azdev/operations/code_gen.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azdev/operations/code_gen.py b/azdev/operations/code_gen.py index 6961709e7..e8dafc48d 100644 --- a/azdev/operations/code_gen.py +++ b/azdev/operations/code_gen.py @@ -124,7 +124,10 @@ def _copy_vendored_sdk(src_path, dest_path): import shutil try: - client_location = find_files(src_path, '_version.py')[0] + version_files = find_files(src_path, 'version.py') + if not version_files: + version_files = find_files(src_path, '_version.py') + client_location = version_files[0] except IndexError: raise CLIError('Unable to find client files.')