瀏覽代碼

Debian build classification 'beta' cannot override 'release'.

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 <ivaradi@varadiistvan.hu>
István Váradi 2 年之前
父節點
當前提交
5dacf60fae
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      admin/linux/debian/scripts/git2changelog.py

+ 3 - 1
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,