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

Do not exist when combination check fails but warning

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-11-22 22:00:59 +09:00
parent c9d7013b77
commit a3f51f0e24
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
aqt/cli.py
View File

@@ -111,8 +111,7 @@ class Cli():
sevenzip = self._set_sevenzip(args) sevenzip = self._set_sevenzip(args)
mirror = self._check_mirror(args) mirror = self._check_mirror(args)
if not self._check_qt_arg_combination(qt_version, os_name, target, arch): if not self._check_qt_arg_combination(qt_version, os_name, target, arch):
self.logger.error("Specified target combination is not valid: {} {} {}".format(os_name, target, arch)) self.logger.warning("Specified target combination is not valid: {} {} {}".format(os_name, target, arch))
exit(1)
QtInstaller(QtArchives(os_name, target, qt_version, arch, modules=modules, mirror=mirror, logging=self.logger), QtInstaller(QtArchives(os_name, target, qt_version, arch, modules=modules, mirror=mirror, logging=self.logger),
logging=self.logger).install(command=sevenzip, target_dir=output_dir) logging=self.logger).install(command=sevenzip, target_dir=output_dir)
sys.stdout.write("\033[K") sys.stdout.write("\033[K")
@@ -127,10 +126,11 @@ class Cli():
version = args.version version = args.version
mirror = self._check_mirror(args) mirror = self._check_mirror(args)
if not self._check_tools_arg_combination(os_name, tool_name, arch): if not self._check_tools_arg_combination(os_name, tool_name, arch):
self.logger.error("Specified target combination is not valid: {} {} {}".format(os_name, tool_name, arch)) self.logger.warning("Specified target combination is not valid: {} {} {}".format(os_name, tool_name, arch))
exit(1)
QtInstaller(ToolArchives(os_name, tool_name, version, arch, mirror=mirror, logging=self.logger), QtInstaller(ToolArchives(os_name, tool_name, version, arch, mirror=mirror, logging=self.logger),
logging=self.logger).install(command=sevenzip, target_dir=output_dir) logging=self.logger).install(command=sevenzip, target_dir=output_dir)
sys.stdout.write("\033[K")
print("Finished installation")
def run_list(self, args): def run_list(self, args):
print('List Qt packages for %s' % args.qt_version) print('List Qt packages for %s' % args.qt_version)

1
requirements.txt
View File

@@ -2,7 +2,6 @@ six
requests requests
pytest pytest
pytest-pep8 pytest-pep8
pytest-cov
flake8 flake8
wheel wheel
twine twine