From 6f604598144b9adc952d20b8f85d7e37e38f6951 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 29 Sep 2024 21:08:05 +0200 Subject: [PATCH] Revert "roomservice: Try major-only revision if default doesn't exist" This reverts commit 39392c99e1a63f45b4981247b03aebe31e01c83e. Change-Id: I124fb3cb668715b1c15a7bcd07f5889785333c16 --- build/tools/roomservice.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py index 835d792d..1db7d69f 100755 --- a/build/tools/roomservice.py +++ b/build/tools/roomservice.py @@ -259,9 +259,6 @@ def fetch_dependencies(repo_path): def has_branch(branches, revision): return revision in [branch['name'] for branch in branches] -def get_default_revision_no_minor(): - return get_default_revision().rsplit('.', 1)[0] - def get_default_or_fallback_revision(repo_name): default_revision = get_default_revision() print("Default revision: %s" % default_revision) @@ -273,14 +270,12 @@ def get_default_or_fallback_revision(repo_name): if has_branch(result, default_revision): return default_revision - fallbacks = [ get_default_revision_no_minor() ] if os.getenv('ROOMSERVICE_BRANCHES'): - fallbacks += list(filter(bool, os.getenv('ROOMSERVICE_BRANCHES').split(' '))) - - for fallback in fallbacks: - if has_branch(result, fallback): - print("Using fallback branch: %s" % fallback) - return fallback + fallbacks = list(filter(bool, os.getenv('ROOMSERVICE_BRANCHES').split(' '))) + for fallback in fallbacks: + if has_branch(result, fallback): + print("Using fallback branch: %s" % fallback) + return fallback print("Default revision %s not found in %s. Bailing." % (default_revision, repo_name)) print("Branches found:")