From cd8b40c653ff67a55582cc809a30404789b0ed4b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Apr 2023 04:22:37 +0100 Subject: rewrite install; cleaner API : one entrypoint instead of three, handle keyboard interrupt gracefully --- src/frontend/cli/sisyphus-cli.py | 4 ++-- src/frontend/gui/sisyphus-gui.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/frontend') diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index e273419..76a8cb2 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -131,9 +131,9 @@ def install(pkgname: List[str], and packages will be installed straight away. """ if ebuild: - sisyphus.install.estart(pkgname, oneshot=oneshot) + sisyphus.install.start(pkgname, ebuild=True, gfx_ui=False, oneshot=oneshot) else: - sisyphus.install.start(pkgname, oneshot=oneshot) + sisyphus.install.start(pkgname, ebuild=False, gfx_ui=False, oneshot=oneshot) @app.command("uninstall") def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "-f")): diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 72c6cf7..8b8f451 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -398,7 +398,7 @@ class MainWorker(QtCore.QObject): def startInstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.install.xstart(pkgname) + sisyphus.install.start(pkgname, ebuild=False, gfx_ui=True, oneshot=False) self.finished.emit() @QtCore.pyqtSlot() -- cgit v1.2.3