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/update.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/backend/update.py') diff --git a/src/backend/update.py b/src/backend/update.py index 0253118..0fe1fde 100644 --- a/src/backend/update.py +++ b/src/backend/update.py @@ -18,29 +18,31 @@ def syncAll(): @animation.wait('fetching updates') def start(): + activeBranch = sisyphus.check.branch() isBinhost = sisyphus.binhost.start() - needsMatch,localBranch = sisyphus.check.branch() + isSane = sisyphus.check.sanity() - if needsMatch == 0: + if isSane == 1: syncAll() else: if "packages-next" in isBinhost: - print("\nCurrent branch: '" + localBranch.decode().strip() + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)") + print("\nCurrent branch: '" + activeBranch + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)") else: - print("\nCurrent branch: '" + localBranch.decode().strip() + "' (testing)" + "\nCurrent binhost: '" + isBinhost + "' (stable)") + print("\nCurrent branch: '" + activeBranch + "' (testing)" + "\nCurrent binhost: '" + isBinhost + "' (stable)") sys.exit("\nInvalid branch - binhost pairing; Use 'sisyphus branch --help' for help; Quitting.") def startqt(): + activeBranch = sisyphus.check.branch() isBinhost = sisyphus.binhost.start() - needsMatch,localBranch = sisyphus.check.branch() + isSane = sisyphus.check.sanity() - if needsMatch == 0: + if isSane == 1: syncAll() else: if "packages-next" in isBinhost: - print("\nCurrent branch: '" + localBranch.decode().strip() + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)") + print("\nCurrent branch: '" + activeBranch + "' (stable)" + "\nCurrent binhost: '" + isBinhost + "' (testing)") else: - print("\nCurrent branch: '" + localBranch.decode().strip() + "' (testing)" + "\nCurrent binhost: '" + isBinhost + "' (stable)") + print("\nCurrent branch: '" + activeBranch + "' (testing)" + "\nCurrent binhost: '" + isBinhost + "' (stable)") print("\nInvalid branch - binhost pairing; Use 'sisyphus branch --help' for help; Quitting in 10 seconds.\n") t = int(10) while t: -- cgit v1.2.3