From 37381bb9d592c77d8ceafb55c602d122a95aec65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Feb 2021 23:13:08 +0000 Subject: order imports, minor fix in check module --- src/backend/binhost.py | 2 +- src/backend/branchsetup.py | 4 ++-- src/backend/check.py | 12 ++++++------ src/backend/ebuildinstall.py | 2 +- src/backend/ebuildupgrade.py | 2 +- src/backend/forceuninstall.py | 2 +- src/backend/search.py | 2 +- src/backend/solvedeps.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/binhost.py b/src/backend/binhost.py index 809fa34..91a6e53 100644 --- a/src/backend/binhost.py +++ b/src/backend/binhost.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 -import subprocess import io +import subprocess def start(): isBinhost = [] diff --git a/src/backend/branchsetup.py b/src/backend/branchsetup.py index 8c2a63b..f3546b4 100644 --- a/src/backend/branchsetup.py +++ b/src/backend/branchsetup.py @@ -1,15 +1,15 @@ #!/usr/bin/python3 import animation -import os import git +import os +import sys import sisyphus.check import sisyphus.branchreset import sisyphus.filesystem import sisyphus.metadata import sisyphus.setjobs import sisyphus.setprofile -import sys def getBranchRemote(branch,remote): portageRemote = [] diff --git a/src/backend/check.py b/src/backend/check.py index 9269735..c4b566e 100644 --- a/src/backend/check.py +++ b/src/backend/check.py @@ -32,7 +32,7 @@ def match(): def portage(): if os.path.isdir(os.path.join(sisyphus.filesystem.portageRepoDir, '.git')): os.chdir(sisyphus.filesystem.portageRepoDir) - needsPortageSync = int() + needsPortage = int() localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) localHash = subprocess.check_output(['git', 'rev-parse', '@']) @@ -41,15 +41,15 @@ def portage(): gitExec = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) if not localHash.decode().strip() == remoteHash.decode().strip(): - needsPortageSync = int(1) + needsPortage = int(1) gitExec.wait() - return needsPortageSync + return needsPortage def overlay(): if os.path.isdir(os.path.join(sisyphus.filesystem.redcoreRepoDir, '.git')): os.chdir(sisyphus.filesystem.redcoreRepoDir) - needsOverlaySync = int() + needsOverlay = int() localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) localHash = subprocess.check_output(['git', 'rev-parse', '@']) @@ -58,10 +58,10 @@ def overlay(): gitExec = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) if not localHash.decode().strip() == remoteHash.decode().strip(): - needsOverlaySync = int(1) + needsOverlay = int(1) gitExec.wait() - return needsOverlaySync + return needsOverlay def update(): portage() diff --git a/src/backend/ebuildinstall.py b/src/backend/ebuildinstall.py index b570734..c20ad57 100644 --- a/src/backend/ebuildinstall.py +++ b/src/backend/ebuildinstall.py @@ -1,10 +1,10 @@ #!/usr/bin/python3 +import io import os import shutil import subprocess import sys -import io import wget import sisyphus.binhost import sisyphus.check diff --git a/src/backend/ebuildupgrade.py b/src/backend/ebuildupgrade.py index fb66be6..8d7f501 100644 --- a/src/backend/ebuildupgrade.py +++ b/src/backend/ebuildupgrade.py @@ -1,10 +1,10 @@ #!/usr/bin/python3 +import io import os import shutil import subprocess import sys -import io import wget import sisyphus.binhost import sisyphus.check diff --git a/src/backend/forceuninstall.py b/src/backend/forceuninstall.py index 11139f4..b027004 100644 --- a/src/backend/forceuninstall.py +++ b/src/backend/forceuninstall.py @@ -1,9 +1,9 @@ #!/usr/bin/python3 import subprocess +import sys import sisyphus.check import sisyphus.database -import sys def start(pkgname): if sisyphus.check.root(): diff --git a/src/backend/search.py b/src/backend/search.py index b52c3c6..18eeb82 100644 --- a/src/backend/search.py +++ b/src/backend/search.py @@ -1,9 +1,9 @@ #!/usr/bin/python3 +import sqlite3 import sisyphus.check import sisyphus.filesystem import sisyphus.update -import sqlite3 def searchDB(filter, cat = '', pn = '', desc = ''): NOVIRT = "AND cat NOT LIKE 'virtual'" diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index 074baf8..d04ebc0 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -1,8 +1,8 @@ #!/usr/bin/python3 import animation -import subprocess import io +import subprocess @animation.wait('resolving dependencies') def package(pkgname): -- cgit v1.2.3