From 4a0acaf3ccb572f37b63e6778f15cfaca18a48b3 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 19 Apr 2022 17:30:47 +0200 Subject: docs: set_versions.py: fix latest release of a branch being shown twice in switchers.js versions array is supposed to store the latest version of all active releases. However, in the loop it is reassigned and therefore, the check on whether our version is already in the versions array will always return false (except for the latest version of the last active release) and write our version again in the list. By using a local variable for the logic instead of versions array, the check now works properly. Fixes: f2b069be8c307 "set_versions: Various improvements" Cc: Quentin Schulz (From yocto-docs rev: 36a088c8c99dd37f5ca07ec8f90f2c51ef8b36f2) Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie --- documentation/set_versions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'documentation/set_versions.py') diff --git a/documentation/set_versions.py b/documentation/set_versions.py index 0fcbb993be..4114ae5737 100755 --- a/documentation/set_versions.py +++ b/documentation/set_versions.py @@ -211,13 +211,13 @@ with open("sphinx-static/switchers.js.in", "r") as r, open("sphinx-static/switch for branch in activereleases: if branch == devbranch: continue - versions = subprocess.run('git tag --list yocto-%s*' % (release_series[branch]), shell=True, capture_output=True, text=True).stdout.split() - versions = sorted([v.replace("yocto-" + release_series[branch] + ".", "").replace("yocto-" + release_series[branch], "0") for v in versions], key=int) - if not versions: + branch_versions = subprocess.run('git tag --list yocto-%s*' % (release_series[branch]), shell=True, capture_output=True, text=True).stdout.split() + branch_versions = sorted([v.replace("yocto-" + release_series[branch] + ".", "").replace("yocto-" + release_series[branch], "0") for v in branch_versions], key=int) + if not branch_versions: continue version = release_series[branch] - if versions[-1] != "0": - version = version + "." + versions[-1] + if branch_versions[-1] != "0": + version = version + "." + branch_versions[-1] versions.append(version) w.write(" '%s': {'title': '%s', 'obsolete': %s,},\n" % (version, version, str(branch == ourseries).lower())) if ourversion not in versions and ourseries != devbranch: -- cgit v1.2.3-54-g00ecf