* tools/hook-scripts/mailer/mailer.py:
(Config.repos_params): don't use "defaults" for the merged values.
The comments make this confusing. Use "merged" for clarity.
[ related to PR #33 ]
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1927078 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/hook-scripts/mailer/mailer.py b/tools/hook-scripts/mailer/mailer.py
index f9f82dc..ca123d8 100755
--- a/tools/hook-scripts/mailer/mailer.py
+++ b/tools/hook-scripts/mailer/mailer.py
@@ -1401,8 +1401,9 @@
# Extract key/value pairs from the regex match of this
# repository, and merge them into the default params.
# Make sure to copy() to avoid mutation of the argument.
- defaults = defaults.copy()
- defaults.update(match.groupdict())
+ merged = defaults.copy()
+ merged.update(match.groupdict())
+ return merged
# There are no repository-specific key/value params, to add.
return defaults
