aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac@gentoo.org>2023-02-22 12:07:49 +0200
committerSam James <sam@gentoo.org>2023-04-25 04:45:14 +0100
commitb300d2f02c89a0babe14ace86fb129075cf68faa (patch)
tree9f78904e905a86ffb830038e0f119489930ff7f9
parentReplace repoman with pgkdev (diff)
downloadtatt-b300d2f02c89a0babe14ace86fb129075cf68faa.tar.gz
tatt-b300d2f02c89a0babe14ace86fb129075cf68faa.tar.bz2
tatt-b300d2f02c89a0babe14ace86fb129075cf68faa.zip
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 <ceamac@gentoo.org> Closes: https://github.com/gentoo/tatt/pull/78 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--templates/commit-header6
-rw-r--r--templates/updatebug7
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'