From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E734E15ACFC for ; Tue, 25 Apr 2023 03:46:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2EFAE096A; Tue, 25 Apr 2023 03:46:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C18D9E096A for ; Tue, 25 Apr 2023 03:46:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC111335DA8 for ; Tue, 25 Apr 2023 03:46:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64719A49 for ; Tue, 25 Apr 2023 03:46:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1682394314.b300d2f02c89a0babe14ace86fb129075cf68faa.sam@gentoo> Subject: [gentoo-commits] proj/tatt:master commit in: templates/ X-VCS-Repository: proj/tatt X-VCS-Files: templates/commit-header templates/updatebug X-VCS-Directories: templates/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b300d2f02c89a0babe14ace86fb129075cf68faa X-VCS-Branch: master Date: Tue, 25 Apr 2023 03:46:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78e5304e-69c5-4e02-a052-86c09f2ff037 X-Archives-Hash: 23dcbdf174713d99da76c037bb14bf46 commit: b300d2f02c89a0babe14ace86fb129075cf68faa Author: Viorel Munteanu gentoo org> AuthorDate: Wed Feb 22 10:07:49 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 25 03:45:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/tatt.git/commit/?id=b300d2f0 Update commit and bug messages According to this: https://wiki.gentoo.org/wiki/Project:AMD64_Arch_Testers "On Bugzilla, do not use the comment 'amd64 stable', use 'amd64 tested' or 'amd64 ok' instead" I looked at recent stabilization commits and bugs and I updated the messages to match. Signed-off-by: Viorel Munteanu gentoo.org> Closes: https://github.com/gentoo/tatt/pull/78 Signed-off-by: Sam James gentoo.org> templates/commit-header | 6 +++--- templates/updatebug | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/templates/commit-header b/templates/commit-header index 5b99e7a..867e624 100644 --- a/templates/commit-header +++ b/templates/commit-header @@ -2,11 +2,11 @@ pushd @@REPODIR@@ > /dev/null if [ "@@NEWKEYWORD@@" = "@@ARCH@@" ]; then - DESCR="@@ARCH@@ stable" + DESCR="Stabilize @@ARCH@@" else - DESCR="@@ARCH@@ keyworded" + DESCR="Keyword @@ARCH@@" fi if [ -n "@@BUG@@" ]; then - DESCR="${DESCR} (bug #@@BUG@@)" + DESCR="${DESCR}, #@@BUG@@" fi diff --git a/templates/updatebug b/templates/updatebug index 548aa06..f17d653 100644 --- a/templates/updatebug +++ b/templates/updatebug @@ -37,10 +37,7 @@ def main(): # We don't close bugs which still have other arches for obvious reasons, # and security bugs because stabilization is not the last step for them. - if '@@NEWKEYWORD@@' == '@@ARCH@@': - comment = "@@ARCH@@ stable" - else: - comment = "@@ARCH@@ keyworded" + comment = "@@ARCH@@ done" params['cc'] = {} if has_my_arch: params['cc']['remove'] = ['@@ARCH@@@gentoo.org'] @@ -48,7 +45,7 @@ def main(): if has_other_arches or 'Security' in response['product']: params['comment']['body'] = comment else: - params['comment']['body'] = comment + ', closing' + params['comment']['body'] = comment + '\r\n\r\nall arches done' params['status'] = 'RESOLVED' params['resolution'] = 'FIXED'