From 0e455bd362cabb4607ea6a32eff82dbcdaafdb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Sun, 12 Mar 2023 14:23:28 +0100 Subject: [PATCH] Debian build classification 'beta' cannot override 'release'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Ubuntu/Debian build script classifies the built commit based on the tags, if any, pointing to the commit. This classification is used to determine the target PPA. If no suitable tag points the commit, it will be an 'alpha' build. If a tag of the format 'vA.B.C' points to the commit, it will be a 'release' build, if the version is followed by something, e.g. 'vA.B.C-rc1', it will be a 'beta' build. The current classification fails if both a 'beta' and a 'release' tag points to the commit, such as in case of the recent v3.7.4 release, where the '-rc1' tag points to the commit that was later released. It was deemed to be a 'beta' build. This patch fixes this behaviour to build such commits as 'release'es. Signed-off-by: István Váradi --- admin/linux/debian/scripts/git2changelog.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index 4516d0f67c923..f5696511edcb5 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -106,7 +106,9 @@ def collectEntries(baseCommit, baseVersion, kind, finalBaseVersion, finalRevDate result = processVersionTag(tag) if result: lastVersionTag = tag - (baseVersion, kind) = result + (baseVersion, kind1) = result + if kind1!=kind and kind!="release": + kind = kind1 entries.append((commit, name, email, date, revdate, subject,