Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix suggestions for src/doc/ex missing modules

Browse Source
This commit is contained in:
David Dalcino
2021-11-23 12:17:03 -08:00
parent 31bcbe945b
commit cfc241002d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aqt/archives.py
View File

@@ -351,6 +351,16 @@ class SrcDocExamplesArchives(QtArchives):
""" """
return TargetConfig("src_doc_examples", self.target, self.arch, self.os_name) return TargetConfig("src_doc_examples", self.target, self.arch, self.os_name)
def help_msg(self, missing_modules: Iterable[str]) -> Iterable[str]:
cmd_type = "example" if self.flavor == "examples" else self.flavor
base_cmd = f"aqt list-{cmd_type} {self.os_name} {self.version}"
mods = f"Please use '{base_cmd} --modules' to show modules available."
has_non_base_pkg: bool = len(list(missing_modules)) > 1
messages = []
if has_non_base_pkg:
messages.append(mods)
return messages
class ToolArchives(QtArchives): class ToolArchives(QtArchives):
"""Hold tool archive package list """Hold tool archive package list

13
tests/test_install.py
View File

@@ -665,16 +665,21 @@ def test_install(
"In the future, please omit this parameter.\n" "In the future, please omit this parameter.\n"
"The packages ['doc', 'foo', 'nonexistent'] were not found while parsing XML of package information!\n" "The packages ['doc', 'foo', 'nonexistent'] were not found while parsing XML of package information!\n"
"==============================Suggested follow-up:==============================\n" "==============================Suggested follow-up:==============================\n"
"* Please use 'aqt list-qt windows desktop --arch 5.15.0' to show architectures available.\n" "* Please use 'aqt list-doc windows 5.15.0 --modules' to show modules available.\n",
"* Please use 'aqt list-qt windows desktop --modules 5.15.0 <arch>' to show modules available.\n",
), ),
( (
"install-doc windows 5.15.0 -m nonexistent foo", "install-doc windows 5.15.0 -m nonexistent foo",
"windows-5152-src-doc-example-update.xml", "windows-5152-src-doc-example-update.xml",
"The packages ['doc', 'foo', 'nonexistent'] were not found while parsing XML of package information!\n" "The packages ['doc', 'foo', 'nonexistent'] were not found while parsing XML of package information!\n"
"==============================Suggested follow-up:==============================\n" "==============================Suggested follow-up:==============================\n"
"* Please use 'aqt list-qt windows desktop --arch 5.15.0' to show architectures available.\n" "* Please use 'aqt list-doc windows 5.15.0 --modules' to show modules available.\n",
"* Please use 'aqt list-qt windows desktop --modules 5.15.0 <arch>' to show modules available.\n", ),
(
"install-example windows 5.15.0 -m nonexistent foo",
"windows-5152-src-doc-example-update.xml",
"The packages ['examples', 'foo', 'nonexistent'] were not found while parsing XML of package information!\n"
"==============================Suggested follow-up:==============================\n"
"* Please use 'aqt list-example windows 5.15.0 --modules' to show modules available.\n",
), ),
( (
"install-tool windows desktop tools_vcredist nonexistent", "install-tool windows desktop tools_vcredist nonexistent",