From 712f936222be4c06ca00ef922a98cd94db71af11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Oct 2022 14:19:00 +0000 Subject: move autoRemoveAll -> autoremove --- src/backend/__init__.py | 2 +- src/backend/autoRemoveAll.py | 28 ---------------------------- src/backend/autoremove.py | 28 ++++++++++++++++++++++++++++ src/frontend/cli/sisyphus-cli.py | 2 +- src/frontend/gui/sisyphus-gui.py | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 src/backend/autoRemoveAll.py create mode 100644 src/backend/autoremove.py (limited to 'src') diff --git a/src/backend/__init__.py b/src/backend/__init__.py index ecbde21..f0728d3 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -1,4 +1,4 @@ -from .autoRemoveAll import * +from .autoremove import * from .checkEnvironment import * from .getEnvironment import * from .getFilesystem import * diff --git a/src/backend/autoRemoveAll.py b/src/backend/autoRemoveAll.py deleted file mode 100644 index 85a7b7f..0000000 --- a/src/backend/autoRemoveAll.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python3 - -import atexit -import io -import subprocess -import sys -import sisyphus.checkEnvironment -import sisyphus.killPortage -import sisyphus.syncDatabase - -def cliExec(): - if sisyphus.checkEnvironment.root(): - portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask']) - portageExec.wait() - sisyphus.syncDatabase.localTable() - else: - sys.exit("\nYou need root permissions to do this, exiting!\n") - -def guiExec(): - 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) - - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) - - portageExec.wait() - sisyphus.syncDatabase.localTable() diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py new file mode 100644 index 0000000..9b993ef --- /dev/null +++ b/src/backend/autoremove.py @@ -0,0 +1,28 @@ +#!/usr/bin/python3 + +import atexit +import io +import subprocess +import sys +import sisyphus.checkEnvironment +import sisyphus.killPortage +import sisyphus.syncDatabase + +def start(): + if sisyphus.checkEnvironment.root(): + portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask']) + portageExec.wait() + sisyphus.syncDatabase.localTable() + else: + sys.exit("\nYou need root permissions to do this, exiting!\n") + +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) + + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + print(portageOutput.rstrip()) + + portageExec.wait() + sisyphus.syncDatabase.localTable() diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index df0a125..b1b2e3f 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -172,7 +172,7 @@ def autoremove(): In addition, a package may no longer depend on another one, so that other package becomes orphan as well if nothing else requires it. Use this option to check the whole dependency chain for such packages, and uninstall them. """ - sisyphus.autoRemoveAll.cliExec() + sisyphus.autoremove.start() @app.command("update") def update(): diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index c3d5ea5..fe3803e 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -417,7 +417,7 @@ class MainWorker(QtCore.QObject): @QtCore.pyqtSlot() def startAutoremove(self): self.started.emit() - sisyphus.autoRemoveAll.guiExec() + sisyphus.autoremove.startx() self.finished.emit() -- cgit v1.2.3