From ed3747e4ff721914d1df6b62788a91a1e8b3f741 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Feb 2021 01:07:55 +0000 Subject: * better explain some used terms * update the help menu and CLI documentation * remove animations from setjobs module (it takes less than a second, so it's pointless) * make some error messages less cryptic && offer help to understand them * don't kill the graphical interface right away if there is a missmatch, display the error, offer help && and then die in 10 seconds --- src/backend/check.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/backend/check.py') diff --git a/src/backend/check.py b/src/backend/check.py index 2c4cedb..d764a85 100644 --- a/src/backend/check.py +++ b/src/backend/check.py @@ -9,23 +9,23 @@ def root(): return True if os.getuid() == 0 else False def branch(): - branchRepoMissmatch = int() + branchBinhostMatch = int() binhostURL = sisyphus.binhost.getURL() localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) os.chdir(sisyphus.filesystem.portageRepoDir) if "packages-next" in binhostURL: if localBranch.decode().strip() == "next": - branchRepoMissmatch = int(0) + branchBinhostMatch = int(1) else: - branchRepoMissmatch = int(1) + branchBinhostMatch = int(0) else: if localBranch.decode().strip() == "master": - branchRepoMissmatch = int(0) + branchBinhostMatch = int(1) else: - branchRepoMissmatch = int(1) + branchBinhostMatch = int(0) - return branchRepoMissmatch,localBranch + return branchBinhostMatch,localBranch def portage(): if os.path.isdir(os.path.join(sisyphus.filesystem.portageRepoDir, '.git')): -- cgit v1.2.3