From b51a4c690ccf0353e87211ea4864d49b1c3d5c70 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Oct 2022 12:50:51 +0100 Subject: merge uninstall && force uninstall functions --- 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 5559bbb..69aaf5f 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -161,9 +161,9 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", " will succeed, but the system will be broken """ if not force: - sisyphus.uninstallAll.start(pkgname) + sisyphus.uninstallAll.cliExec(pkgname) else: - sisyphus.uninstallAllForce.start(pkgname) + sisyphus.uninstallAll.cliExecForce(pkgname) @app.command("autoremove") def autoremove(): diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 2606a77..41e0d01 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -389,7 +389,7 @@ class MainWorker(QtCore.QObject): def startUninstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.uninstallAll.startqt(pkgname) + sisyphus.uninstallAll.guiExec(pkgname) self.finished.emit() @QtCore.pyqtSlot() -- cgit v1.2.3