diff options
| -rw-r--r-- | templates/commit-header | 6 | ||||
| -rw-r--r-- | 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' |