Skip to content

[Upgrade] Fix 16952: Fix ImportError after upgrade #17314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Feng Zhou (fengzhou-msft) merged 3 commits into from
Mar 16, 2021
Merged

[Upgrade] Fix 16952: Fix ImportError after upgrade #17314

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8acdb83
set HOMEBREW_NO_INSTALL_CLEANUP=1
fengzhou-msft Mar 11, 2021
af4b198
use str for env variable value
fengzhou-msft Mar 15, 2021
b4b5a88
use subprocess to call az to get version
fengzhou-msft Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/azure-cli/azure/cli/command_modules/util/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,24 @@ def upgrade_version(cmd, update_all=None, yes=None): # pylint: disable=too-many
telemetry.set_failure(err_msg)
sys.exit(exit_code)

import azure.cli.core
# Avoid using python modules directly as they may have been changed due to upgrade.
# If you do need to use them, you may need to reload them and their dependent modules.
# Otherwise you may have such issue https://github.com/Azure/azure-cli/issues/16952
import importlib
importlib.reload(azure.cli.core)
new_version = azure.cli.core.__version__
import json
importlib.reload(subprocess)
importlib.reload(json)

version_result = subprocess.check_output(['az', 'version', '-o', 'json'], shell=platform.system() == 'Windows')
version_json = json.loads(version_result)
new_version = version_json['azure-cli-core']

if update_cli and new_version == local_version:
err_msg = "CLI upgrade failed or aborted."
logger.warning(err_msg)
telemetry.set_failure(err_msg)
sys.exit(1)

# Python is reinstalled in another versioned directory with Homebrew, subprocess needs to be reloaded
if installer == 'HOMEBREW' and exts:
importlib.reload(subprocess)

if exts:
logger.warning("Upgrading extensions")
for ext_name in exts:
Expand Down