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

Add ArchiveExtractionError

Browse Source
This commit is contained in:
David Dalcino
2021-09-01 16:08:56 -07:00
parent 7fa9dff9ea
commit 50ced0aafe
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aqt/exceptions.py
View File

@@ -65,3 +65,7 @@ class CliInputError(AqtException):
class CliKeyboardInterrupt(AqtException): class CliKeyboardInterrupt(AqtException):
pass pass
class ArchiveExtractionError(AqtException):
pass

10
aqt/installer.py
View File

@@ -36,7 +36,7 @@ from typing import Any, Callable, List, Optional
import aqt import aqt
from aqt.archives import QtArchives, QtPackage, SrcDocExamplesArchives, ToolArchives from aqt.archives import QtArchives, QtPackage, SrcDocExamplesArchives, ToolArchives
from aqt.exceptions import AqtException, ArchiveConnectionError, CliInputError, CliKeyboardInterrupt from aqt.exceptions import AqtException, ArchiveConnectionError, ArchiveExtractionError, CliInputError, CliKeyboardInterrupt
from aqt.helper import MyQueueListener, Settings, downloadBinaryFile, getUrl, setup_logging from aqt.helper import MyQueueListener, Settings, downloadBinaryFile, getUrl, setup_logging
from aqt.metadata import ArchiveId, MetadataFactory, SimpleSpec, Version, show_list from aqt.metadata import ArchiveId, MetadataFactory, SimpleSpec, Version, show_list
from aqt.updater import Updater from aqt.updater import Updater
@@ -823,12 +823,8 @@ def installer(
proc = subprocess.run(command_args, stdout=subprocess.PIPE, check=True) proc = subprocess.run(command_args, stdout=subprocess.PIPE, check=True)
logger.debug(proc.stdout) logger.debug(proc.stdout)
except subprocess.CalledProcessError as cpe: except subprocess.CalledProcessError as cpe:
logger.error("Extraction error: %d" % cpe.returncode) msg = "\n".join(filter(None, [f"Extraction error: {cpe.returncode}", cpe.stdout, cpe.stderr]))
if cpe.stdout is not None: raise ArchiveExtractionError(msg) from cpe
logger.error(cpe.stdout)
if cpe.stderr is not None:
logger.error(cpe.stderr)
raise cpe
if not keep: if not keep:
os.unlink(archive) os.unlink(archive)
logger.info("Finished installation of {} in {:.8f}".format(archive, time.perf_counter() - start_time)) logger.info("Finished installation of {} in {:.8f}".format(archive, time.perf_counter() - start_time))