From d63b38783a98902e5dacc6e550420fb1048b1532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 27 Jul 2020 12:16:51 +0200 Subject: [PATCH] Fix a bug on list_unreleased_changes during tag retrieving Indeed `gitutils.gitutils.stable_branch_exists` is waiting for a branch name not prefixed with `stable/`. This was not an issue with the previous shell version. These changes fix that. Without these changes the master branch will be analyzed and stable branches will be ignored. Change-Id: I61542508e8566eb797b0e304a6914d25e3b07e14 --- openstack_releases/cmds/list_unreleased_changes.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openstack_releases/cmds/list_unreleased_changes.py b/openstack_releases/cmds/list_unreleased_changes.py index 8b2e740c5c..37f510d858 100644 --- a/openstack_releases/cmds/list_unreleased_changes.py +++ b/openstack_releases/cmds/list_unreleased_changes.py @@ -259,8 +259,9 @@ def main(): # Determine which branch we should actually be looking # at. Assume any series for which there is no stable # branch will be on 'master'. - if gitutils.stable_branch_exists(workdir, repo, args.branch): - branch = 'stable/' + args.branch + branch = args.branch.replace('stable/', '') + if gitutils.stable_branch_exists(workdir, repo, branch): + branch = 'stable/' + branch else: branch = 'master'