Tweak email content and subject. (#264)
diff --git a/tools/gen-release-vote.py b/tools/gen-release-vote.py
index c399820..69a6d9d 100755
--- a/tools/gen-release-vote.py
+++ b/tools/gen-release-vote.py
@@ -91,12 +91,13 @@
def sendVoteEmail(mailConfig, rcConfig, dryrun, subjectLineId, signature):
components = list(componentList(rcConfig))
componentsString = ', '.join(map(lambda c: c.name, components))
+ componentCount = len(components)
version = releaseVersion(rcConfig)
- subject = '[VOTE] Release Apache OpenWhisk %s (v%s, %s)' % (subjectLineId if subjectLineId else componentsString, version.v, version.rc)
+ subject = '[VOTE] Release Apache %s (v%s, %s)' % (subjectLineId if subjectLineId else componentsString, version.v, version.rc)
content = """Hi,
This is a call to vote on releasing version {version} release
-candidate {rc} of the following {N} project modules with artifacts
+candidate {rc} of the following {N} with artifacts
built from the Git repositories and commit IDs listed below.
{githashes}
@@ -128,7 +129,7 @@
This majority vote is open for at least 72 hours.
{signature}""".format(version = version.v,
rc = version.rc,
- N = len(components),
+ N = ("%s project modules" % componentCount) if componentCount > 1 else "project module",
githashes = gitHashes(components),
rcverifies = rcverify(components, version.v),
signature = ("\n%s" % signature) if signature else "")
