From 1ec0c210ca2cbdb729a416e37a50d4b9a6a0dfa0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jun 2020 18:46:14 +0100 Subject: populate __init__.py to simplify the client imports, ignore some irrelevant errors --- src/backend/__init__.py | 27 +++++++++++++++++++++++++++ src/backend/check.py | 4 ++-- src/frontend/cli/sisyphus-cli.py | 15 +-------------- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/backend/__init__.py b/src/backend/__init__.py index e69de29..1b012e3 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -0,0 +1,27 @@ +from .binhost import * +from .branchinject import * +from .branchmaster import * +from .branchnext import * +from .branchreset import * +from .check import * +from .clean import * +from .csvfiles import * +from .database import * +from .help import * +from .install import * +from .killportage import * +from .metadata import * +from .mirror import * +from .removeorphans import * +from .rescue import * +from .search import * +from .setjobs import * +from .setprofile import * +from .solvedeps import * +from .sync import * +from .sysinfo import * +from .uninstallforce import * +from .uninstall import * +from .update import * +from .upgrade import * + diff --git a/src/backend/check.py b/src/backend/check.py index eb786aa..2f46357 100644 --- a/src/backend/check.py +++ b/src/backend/check.py @@ -19,7 +19,7 @@ def portage(): localHash = subprocess.check_output(['git', 'rev-parse', '@']) remoteHash = subprocess.check_output(['git', 'rev-parse', '@{u}']) - gitExec = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + 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) @@ -35,7 +35,7 @@ def overlay(): localHash = subprocess.check_output(['git', 'rev-parse', '@']) remoteHash = subprocess.check_output(['git', 'rev-parse', '@{u}']) - gitExec = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + 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) diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 1393cae..0a98cdd 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -1,19 +1,6 @@ #!/usr/bin/python3 -import sisyphus.branchinject -import sisyphus.check -import sisyphus.help -import sisyphus.install -import sisyphus.mirror -import sisyphus.removeorphans -import sisyphus.rescue -import sisyphus.search -import sisyphus.setjobs -import sisyphus.sysinfo -import sisyphus.uninstall -import sisyphus.uninstallforce -import sisyphus.update -import sisyphus.upgrade +import sisyphus import sys sisyphus.check.update() -- cgit v1.2.3