From 1bb1eb3216267a8b9b1b9c25e163f76ba8072799 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 30 Oct 2022 14:37:38 +0000
Subject: move killPortage -> killemerge

---
 src/backend/__init__.py     | 2 +-
 src/backend/autoremove.py   | 4 ++--
 src/backend/installPkg.py   | 4 ++--
 src/backend/killPortage.py  | 4 ----
 src/backend/killemerge.py   | 4 ++++
 src/backend/uninstallAll.py | 4 ++--
 src/backend/upgradePkg.py   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 src/backend/killPortage.py
 create mode 100644 src/backend/killemerge.py

diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index 3b6ff15..442e116 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -4,7 +4,7 @@ from .getenv import *
 from .getfs import *
 from .installPkg import *
 from .installSrc import *
-from .killPortage import *
+from .killemerge import *
 from .purgeenv import *
 from .recoverDatabase import *
 from .resolveDeps import *
diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py
index 6b8938a..139c850 100644
--- a/src/backend/autoremove.py
+++ b/src/backend/autoremove.py
@@ -5,7 +5,7 @@ import io
 import subprocess
 import sys
 import sisyphus.checkenv
-import sisyphus.killPortage
+import sisyphus.killemerge
 import sisyphus.syncDatabase
 
 def start():
@@ -19,7 +19,7 @@ def start():
 def startx():
     portageExec = subprocess.Popen(['emerge', '--depclean'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
-    atexit.register(sisyphus.killPortage.cliExec, portageExec)
+    atexit.register(sisyphus.killemerge.cliExec, portageExec)
 
     for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
         print(portageOutput.rstrip())
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py
index fd6035a..55af933 100644
--- a/src/backend/installPkg.py
+++ b/src/backend/installPkg.py
@@ -10,7 +10,7 @@ import wget
 import sisyphus.checkenv
 import sisyphus.getenv
 import sisyphus.getfs
-import sisyphus.killPortage
+import sisyphus.killemerge
 import sisyphus.resolveDeps
 import sisyphus.syncDatabase
 import sisyphus.updateAll
@@ -80,7 +80,7 @@ def guiExec(pkgname):
 
     portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
-    atexit.register(sisyphus.killPortage.cliExec, portageExec)
+    atexit.register(sisyphus.killemerge.cliExec, portageExec)
 
     for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
         print(portageOutput.rstrip())
diff --git a/src/backend/killPortage.py b/src/backend/killPortage.py
deleted file mode 100644
index c588252..0000000
--- a/src/backend/killPortage.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/python3
-
-def cliExec(portageCmd):
-    portageCmd.terminate()
diff --git a/src/backend/killemerge.py b/src/backend/killemerge.py
new file mode 100644
index 0000000..c588252
--- /dev/null
+++ b/src/backend/killemerge.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python3
+
+def cliExec(portageCmd):
+    portageCmd.terminate()
diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py
index e5c336d..c7eea8c 100644
--- a/src/backend/uninstallAll.py
+++ b/src/backend/uninstallAll.py
@@ -5,7 +5,7 @@ import io
 import subprocess
 import sys
 import sisyphus.checkenv
-import sisyphus.killPortage
+import sisyphus.killemerge
 import sisyphus.syncDatabase
 
 def cliExec(pkgname):
@@ -27,7 +27,7 @@ def cliExecForce(pkgname):
 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.cliExec, portageExec)
+    atexit.register(sisyphus.killemerge.cliExec, portageExec)
 
     for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
         print(portageOutput.rstrip())
diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py
index d910df3..63a6973 100644
--- a/src/backend/upgradePkg.py
+++ b/src/backend/upgradePkg.py
@@ -10,7 +10,7 @@ import wget
 import sisyphus.checkenv
 import sisyphus.getenv
 import sisyphus.getfs
-import sisyphus.killPortage
+import sisyphus.killemerge
 import sisyphus.resolveDeps
 import sisyphus.syncDatabase
 import sisyphus.updateAll
@@ -84,7 +84,7 @@ def guiExec():
 
             portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             # kill portage if the program dies or it's terminated by the user
-            atexit.register(sisyphus.killPortage.cliExec, portageExec)
+            atexit.register(sisyphus.killemerge.cliExec, portageExec)
 
             for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
                 print(portageOutput.rstrip())
-- 
cgit v1.2.3