Skip to content
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

fix: always use gcc_64 as arch_dir for linux #770

Closed
wants to merge 2 commits into from
Closed

fix: always use gcc_64 as arch_dir for linux #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67a0466
fix: always use gcc_64 as arch_dir for linux
miurahr Mar 20, 2024
e57296a
style: apply black
miurahr Mar 20, 2024
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
2 changes: 2 additions & 0 deletions aqt/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,8 @@ def get_arch_dir_name(host: str, arch: str, version: Version) -> str:
return arch[6:]
elif host == "mac" and arch == "clang_64":
return QtRepoProperty.default_mac_desktop_arch_dir(version)
elif host == "linux":
return QtRepoProperty.default_linux_desktop_arch_dir()
else:
return arch

Expand Down
8 changes: 8 additions & 0 deletions tests/test_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ def setup_settings():
r".*6\.1\.1.*clang_64.*mkspecs.*qconfig.pri.*"
),
),
(
TargetConfig("6.7.0", "desktop", "linux_gcc_64", "linux"),
re.compile(
r"Updater caused an IO error: .*No such file or directory: "
# '.*' wildcard used to match path separators on windows/*nix
r".*6\.7\.0.*gcc_64.*mkspecs.*qconfig.pri.*"
),
),
),
)
def test_updater_update_license_io_error(monkeypatch, target_config: TargetConfig, expected_err_pattern: re.Pattern):
Expand Down
Loading