Re: [PATCH] maintainer-makefile: Fix announcement mail CC's.

[Simon Josefsson]

Simon Josefsson via Gnulib discussion list <bug-gnulib@gnu.org> writes:

> Hi.  I noticed some typos causing the Cc line in mail announcements to
> be empy where that (most likely) wasn't the intention.

It seems some packages (coreutils, grep, ...) set 'announcement_Cc_' in
cfg.mk manually, thus hiding the problem I noticed with the default
behaviour.  I reverted most of my patch (see attachment), ending up with
a total change of only this:

-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_Cc_ ?= $(announcement_Cc_$(release-type))

/Simon

From 804ac808a9b17d7ee7cf49f7c713c4a4e4d6423f Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 28 Jul 2021 10:37:57 +0200
Subject: [PATCH] maintainer-makefile: Respect cfg.mk setting announcement_Cc_,
 reverting most of the previous patch.

* top/maint.mk (announcement_mail_Cc_stable): Rename back to
announcement_Cc_stable.
(announcement_Cc_alpha): Rename back to
announcement_mail_Cc_alpha.
(announcement_Cc_): Renamed from announcement_mail_Cc_.
(announcement_mail_headers_stable)
(announcement_mail_headers_alpha): Use announcement_Cc_ again.
---
 ChangeLog    | 12 ++++++++++++
 top/maint.mk | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 931036755..d8a9bb1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2021-07-28  Simon Josefsson  <simon@josefsson.org>
+
+       maintainer-makefile: Respect cfg.mk setting announcement_Cc_,
+       reverting most of the previous patch.
+       * top/maint.mk (announcement_mail_Cc_stable): Rename back to
+       announcement_Cc_stable.
+       (announcement_Cc_alpha): Rename back to
+       announcement_mail_Cc_alpha.
+       (announcement_Cc_): Renamed from announcement_mail_Cc_.
+       (announcement_mail_headers_stable)
+       (announcement_mail_headers_alpha): Use announcement_Cc_ again.
+
 2021-07-28  Simon Josefsson  <simon@josefsson.org>
 
        maintainer-makefile: Fix announcement mail CC's.
diff --git a/top/maint.mk b/top/maint.mk
index 533591ff9..044254bdc 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1395,21 +1395,21 @@ gpg_key_ID ?=                                           
                \
 translation_project_ ?= coordinator@translationproject.org
 
 # Make info-gnu the default only for a stable release.
-announcement_mail_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
 announcement_mail_headers_stable =             \
   To: info-gnu@gnu.org                         \
-  Cc: $(announcement_mail_Cc_)                 \
+  Cc: $(announcement_Cc_)                      \
   Mail-Followup-To: $(PACKAGE_BUGREPORT)
 
-announcement_mail_Cc_alpha = $(translation_project_)
+announcement_Cc_alpha = $(translation_project_)
 announcement_mail_headers_alpha =              \
   To: $(PACKAGE_BUGREPORT)                     \
-  Cc: $(announcement_mail_Cc_)
+  Cc: $(announcement_Cc_)
 
 announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
 announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
 
-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_Cc_ ?= $(announcement_Cc_$(release-type))
 announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
 announcement: NEWS ChangeLog $(rel-files)
 # Not $(AM_V_GEN) since the output of this command serves as
-- 
2.30.2

signature.asc
Description: PGP signature