这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix import error caused by non_x86_machines rename #10137

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
merged 2 commits into from
Aug 7, 2020
Merged

Fix import error caused by non_x86_machines rename #10137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
251675a
Fix import error caused by `non_x86_machines` rename
chenghlee Aug 7, 2020
78e6153
Perform non-x86 detection on non-Linux hosts
chenghlee Aug 7, 2020
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
4 changes: 2 additions & 2 deletions conda/core/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ def _supplement_index_with_system(index):


def get_archspec_name():
from conda.base.context import non_x86_linux_machines, _arch_names, _platform_map
from conda.base.context import non_x86_machines, _arch_names, _platform_map

target_plat, target_arch = context.subdir.split("-")
# This has to reverse what Context.subdir is doing
if target_plat == "linux" and target_arch in non_x86_linux_machines:
if target_arch in non_x86_machines:
machine = target_arch
elif target_arch == "zos":
return None
Expand Down