merge uninstall && force uninstall functions

5 files changed, 13 insertions, 20 deletions

diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index 39c89ed..ecbde21 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -18,7 +18,6 @@ from .syncDatabase import *
 from .syncEnvironment import *
 from .syncSPM import *
 from .sysInfo import *
-from .uninstallAllForce import *
 from .uninstallAll import *
 from .updateAll import *
 from .upgradePkg import *
diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py
index 4dfe2cc..b874738 100644
--- a/src/backend/uninstallAll.py
+++ b/src/backend/uninstallAll.py
@@ -8,7 +8,7 @@ import sisyphus.checkEnvironment
 import sisyphus.killPortage
 import sisyphus.syncDatabase
 
-def start(pkgname):
+def cliExec(pkgname):
     if sisyphus.checkEnvironment.root():
         portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname))
         portageExec.wait()
@@ -16,7 +16,15 @@ def start(pkgname):
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")
 
-def startqt(pkgname):
+def cliExecForce(pkgname):
+    if sisyphus.checkEnvironment.root():
+        portageExec = subprocess.Popen(['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname))
+        portageExec.wait()
+        sisyphus.syncDatabase.localTable()
+    else:
+        sys.exit("\nYou need root permissions to do this, exiting!\n")
+
+def guiExec(pkgname):
     portageExec = subprocess.Popen(['emerge', '--depclean'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killPortage.start, portageExec)
diff --git a/src/backend/uninstallAllForce.py b/src/backend/uninstallAllForce.py
deleted file mode 100644
index d2acc2d..0000000
--- a/src/backend/uninstallAllForce.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/python3
-
-import subprocess
-import sys
-import sisyphus.checkEnvironment
-import sisyphus.syncDatabase
-
-def start(pkgname):
-    if sisyphus.checkEnvironment.root():
-        portageExec = subprocess.Popen(['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname))
-        portageExec.wait()
-        sisyphus.syncDatabase.localTable()
-    else:
-        sys.exit("\nYou need root permissions to do this, exiting!\n")
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()