Skip to content

Commit

Permalink
Merge pull request #814 from pzhlkj6612/combination-delete
Browse files Browse the repository at this point in the history
fix: remove logic to check or warn about unknown combinations
  • Loading branch information
miurahr authored Aug 16, 2024
2 parents 3c31e47 + 7a0120f commit 253349b
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions aqt/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,33 +200,6 @@ def run(self, arg=None) -> int:
)
return Cli.UNHANDLED_EXCEPTION_CODE

def _check_tools_arg_combination(self, os_name, tool_name, arch):
for c in Settings.tools_combinations:
if c["os_name"] == os_name and c["tool_name"] == tool_name and c["arch"] == arch:
return True
return False

def _check_qt_arg_combination(self, qt_version, os_name, target, arch):
for c in Settings.qt_combinations:
if c["os_name"] == os_name and c["target"] == target and c["arch"] == arch:
return True
return False

def _warning_unknown_qt_version(self, qt_version: str) -> str:
return self._warning_on_bad_combination(f'Qt version "{qt_version}"')

def _warning_unknown_target_arch_combo(self, args: List[str]) -> str:
return self._warning_on_bad_combination(f"target combination \"{' '.join(args)}\"")

def _warning_unexpected_modules(self, unexpected_modules: List[str]) -> str:
return self._warning_on_bad_combination(f"modules {unexpected_modules}")

def _warning_on_bad_combination(self, combo_message: str) -> str:
return (
f"Specified {combo_message} did not exist when this version of aqtinstall was released. "
"This may not install properly, but we will try our best."
)

def _set_sevenzip(self, external: Optional[str]) -> Optional[str]:
sevenzip = external
fallback = Settings.zipcmd
Expand Down

0 comments on commit 253349b

Please sign in to comment.