From 0d91cc6b22cebededd3bf66ad594ef0420933aff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Apr 2023 14:22:24 +0100 Subject: rewrite upgrade; cleaner API : one entrypoint instead of three, handle keyboard interrupt gracefully --- src/frontend/cli/sisyphus-cli.py | 6 +++--- src/frontend/gui/sisyphus-gui.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/frontend') diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 76a8cb2..6ccf587 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -217,10 +217,10 @@ def upgrade(ebuild: bool = typer.Option(False, "--ebuild", "-e")): The --ebuild option will preffer to reuse binary packages(if available) to satisfy the dependencies for the ebuild(source) packages, speeding up the upgrade. You can use the --ebuild option even if you don't have any ebuild(source) packages installed; It will fall back to binary packages only. """ - if not ebuild: - sisyphus.upgrade.start() + if ebuild: + sisyphus.upgrade.start(ebuild=True, gfx_ui=False) else: - sisyphus.upgrade.estart() + sisyphus.upgrade.start(ebuild=False, gfx_ui=False) @app.command("spmsync") def spmsync(): diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 8b8f451..9199510 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -411,7 +411,7 @@ class MainWorker(QtCore.QObject): @QtCore.pyqtSlot() def startUpgrade(self): self.started.emit() - sisyphus.upgrade.xstart() + sisyphus.upgrade.start(ebuild=False, gfx_ui=True) self.finished.emit() @QtCore.pyqtSlot() -- cgit v1.2.3