From 19a58ed9c8f7714ce17db00aa6b8aa91f72d3eb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 24 Mar 2020 16:41:13 +0100 Subject: [PATCH] Generate more unique and ordered version numbers for Debian builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: István Váradi --- admin/linux/debian/scripts/git2changelog.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index 51c6afac0..a48cafe51 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -79,7 +79,9 @@ def collectEntries(baseCommit, baseVersion, kind): words = line.split("\t") (commit, name, email, date, revdate) = words[0:5] subject = "\t".join(words[5:]) + revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S") + revdate += "." + commit kind = "beta" @@ -113,6 +115,11 @@ def collectEntries(baseCommit, baseVersion, kind): entries.append((commit, name, email, date, revdate, subject, baseVersion, kind)) + if entries: + (commit, name, email, date, revdate, subject, baseVersion, kind) = entries[-1] + revdate = datetime.datetime.now().strftime("%Y%m%d.%H%M%S")+ "." + commit + entries[-1] = (commit, name, email, date, revdate, subject, baseVersion, kind) + entries.reverse() return entries -- 2.30.2