From d5f7286a28caf0a7f628c09b515e7ed59a1a85fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 9 Aug 2022 23:04:03 +0100 Subject: backend : split check.branch() function --- src/backend/check.py | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'src/backend/check.py') diff --git a/src/backend/check.py b/src/backend/check.py index a159a27..7f23338 100644 --- a/src/backend/check.py +++ b/src/backend/check.py @@ -9,22 +9,34 @@ def root(): return True if os.getuid() == 0 else False def branch(): + activeBranch = None + if os.path.isdir(os.path.join(sisyphus.filesystem.portageRepoDir, '.git')): os.chdir(sisyphus.filesystem.portageRepoDir) - needsMatch = int() - - isBinhost = sisyphus.binhost.start() localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - if "packages-next" in isBinhost: - if localBranch.decode().strip() == "next": - needsMatch = int(0) - else: - needsMatch = int(1) + if localBranch.decode().strip() == 'master': + activeBranch = str('master') + + if localBranch.decode().strip() == 'next': + activeBranch = str('next') + + return activeBranch + +def sanity(): + activeBranch = branch() + isBinhost = sisyphus.binhost.start() + isSane = int() + + if "packages-next" in isBinhost: + if activeBranch == "next": + isSane = int(1) + else: + isSane = int(0) + else: + if activeBranch == "master": + isSane = int(1) else: - if localBranch.decode().strip() == "master": - needsMatch = int(0) - else: - needsMatch = int(1) + isSane = int(0) - return needsMatch,localBranch + return isSane -- cgit v1.2.3