From 0f778807aedaef085627e243c50641a0fb534b3b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 12 Apr 2023 00:02:04 +0100
Subject: adjust uninstall
---
src/backend/uninstall.py | 4 ++--
src/frontend/cli/sisyphus-cli.py | 4 ++--
src/frontend/gui/sisyphus-gui.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py
index e07c908..70150f9 100644
--- a/src/backend/uninstall.py
+++ b/src/backend/uninstall.py
@@ -18,7 +18,7 @@ def sigint_handler(signal, frame):
signal.signal(signal.SIGINT, sigint_handler)
-def start(pkgname, gfx_ui=False, unmerge=False):
+def start(pkgname, depclean=False, gfx_ui=False, unmerge=False):
args = ['--quiet', '--depclean']
if not sisyphus.checkenv.root() and (unmerge or depclean):
@@ -39,7 +39,7 @@ def start(pkgname, gfx_ui=False, unmerge=False):
except subprocess.TimeoutExpired:
p_exe.kill()
sys.exit()
- else:
+ elif depclean:
if gfx_ui:
p_exe = subprocess.Popen(
['emerge'] + args + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 0d04e8d..18dd2db 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -168,9 +168,9 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "
will succeed, but the system will be broken
"""
if force:
- sisyphus.uninstall.start(pkgname, gfx_ui=False, unmerge=True)
+ sisyphus.uninstall.start(pkgname, depclean=False, gfx_ui=False, unmerge=True)
else:
- sisyphus.uninstall.start(pkgname, gfx_ui=False, unmerge=False)
+ sisyphus.uninstall.start(pkgname, depclean=True, gfx_ui=False, unmerge=False)
@app.command("autoremove")
def autoremove():
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 271cad1..07ff367 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -405,7 +405,7 @@ class MainWorker(QtCore.QObject):
def startUninstall(self):
self.started.emit()
pkgname = Sisyphus.pkgname
- sisyphus.uninstall.start(pkgname, gfx_ui=True, unmerge=False)
+ sisyphus.uninstall.start(pkgname, depclean=True, gfx_ui=True, unmerge=False)
self.finished.emit()
@QtCore.pyqtSlot()
--
cgit v1.2.3