From fb5e03d66502482c3e6b4b04d92a46898403e98c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Sep 2022 19:25:10 +0100 Subject: reorder imports alphabetically --- src/backend/__init__.py | 2 +- src/backend/autoRemoveAll.py | 2 +- src/backend/installPkg.py | 4 ++-- src/backend/installSrc.py | 4 ++-- src/backend/recoverDatabase.py | 2 +- src/backend/uninstallAll.py | 2 +- src/backend/uninstallAllForce.py | 14 ++++++++++++++ src/backend/uninstallForceAll.py | 14 -------------- src/backend/updateAll.py | 4 ++-- src/backend/upgradePkg.py | 4 ++-- src/backend/upgradeSrc.py | 4 ++-- src/frontend/cli/sisyphus-cli.py | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 src/backend/uninstallAllForce.py delete mode 100644 src/backend/uninstallForceAll.py diff --git a/src/backend/__init__.py b/src/backend/__init__.py index bf350e1..d34f90c 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -19,8 +19,8 @@ from .syncDatabase import * from .syncEnvironment import * from .syncSPM import * from .sysInfo import * +from .uninstallAllForce import * from .uninstallAll import * -from .uninstallForceAll import * from .updateAll import * from .upgradePkg import * from .upgradeSrc import * diff --git a/src/backend/autoRemoveAll.py b/src/backend/autoRemoveAll.py index bcf5760..8b47dda 100644 --- a/src/backend/autoRemoveAll.py +++ b/src/backend/autoRemoveAll.py @@ -5,8 +5,8 @@ import io import subprocess import sys import sisyphus.checkEnvironment -import sisyphus.syncDatabase import sisyphus.killPortage +import sisyphus.syncDatabase def start(): if sisyphus.checkEnvironment.root(): diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py index 480e346..b1aaa11 100644 --- a/src/backend/installPkg.py +++ b/src/backend/installPkg.py @@ -7,12 +7,12 @@ import shutil import subprocess import sys import wget -import sisyphus.getBinhost import sisyphus.checkEnvironment -import sisyphus.syncDatabase +import sisyphus.getBinhost import sisyphus.getFilesystem import sisyphus.killPortage import sisyphus.resolveDeps +import sisyphus.syncDatabase import sisyphus.updateAll def start(pkgname): diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py index 5ff5958..aa32bd9 100644 --- a/src/backend/installSrc.py +++ b/src/backend/installSrc.py @@ -6,11 +6,11 @@ import shutil import subprocess import sys import wget -import sisyphus.getBinhost import sisyphus.checkEnvironment -import sisyphus.syncDatabase +import sisyphus.getBinhost import sisyphus.getFilesystem import sisyphus.resolveDeps +import sisyphus.syncDatabase import sisyphus.updateAll def start(pkgname): diff --git a/src/backend/recoverDatabase.py b/src/backend/recoverDatabase.py index c067815..a17c9f1 100644 --- a/src/backend/recoverDatabase.py +++ b/src/backend/recoverDatabase.py @@ -2,8 +2,8 @@ import animation import os -import sisyphus.syncDatabase import sisyphus.getFilesystem +import sisyphus.syncDatabase @animation.wait('recovering databases') def start(): diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py index 4d0c050..c2dfdb6 100644 --- a/src/backend/uninstallAll.py +++ b/src/backend/uninstallAll.py @@ -5,8 +5,8 @@ import io import subprocess import sys import sisyphus.checkEnvironment -import sisyphus.syncDatabase import sisyphus.killPortage +import sisyphus.syncDatabase def start(pkgname): if sisyphus.checkEnvironment.root(): diff --git a/src/backend/uninstallAllForce.py b/src/backend/uninstallAllForce.py new file mode 100644 index 0000000..8a952c6 --- /dev/null +++ b/src/backend/uninstallAllForce.py @@ -0,0 +1,14 @@ +#!/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), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = portageExec.communicate() + sisyphus.syncDatabase.syncLocal() + else: + sys.exit("\nYou need root permissions to do this, exiting!\n") diff --git a/src/backend/uninstallForceAll.py b/src/backend/uninstallForceAll.py deleted file mode 100644 index 8a952c6..0000000 --- a/src/backend/uninstallForceAll.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), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() - sisyphus.syncDatabase.syncLocal() - else: - sys.exit("\nYou need root permissions to do this, exiting!\n") diff --git a/src/backend/updateAll.py b/src/backend/updateAll.py index e981da2..c47d294 100644 --- a/src/backend/updateAll.py +++ b/src/backend/updateAll.py @@ -3,10 +3,10 @@ import animation import sys import time -import sisyphus.getBinhost import sisyphus.checkEnvironment -import sisyphus.syncDatabase +import sisyphus.getBinhost import sisyphus.purgeEnvironment +import sisyphus.syncDatabase import sisyphus.syncEnvironment def syncAll(): diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index 1121747..78f9025 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -7,12 +7,12 @@ import shutil import subprocess import sys import wget -import sisyphus.getBinhost import sisyphus.checkEnvironment -import sisyphus.syncDatabase +import sisyphus.getBinhost import sisyphus.getFilesystem import sisyphus.killPortage import sisyphus.resolveDeps +import sisyphus.syncDatabase import sisyphus.updateAll def start(): diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index 161a7c4..23782b2 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -6,11 +6,11 @@ import shutil import subprocess import sys import wget -import sisyphus.getBinhost import sisyphus.checkEnvironment -import sisyphus.syncDatabase +import sisyphus.getBinhost import sisyphus.getFilesystem import sisyphus.resolveDeps +import sisyphus.syncDatabase import sisyphus.updateAll def start(): diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index cc0d607..5559bbb 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -163,7 +163,7 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", " if not force: sisyphus.uninstallAll.start(pkgname) else: - sisyphus.uninstallForceAll.start(pkgname) + sisyphus.uninstallAllForce.start(pkgname) @app.command("autoremove") def autoremove(): -- cgit v1.2.3