Author: gstein
Date: Tue Jul 8 16:48:26 2025
New Revision: 1927078
URL: http://svn.apache.org/viewvc?rev=1927078&view=rev
Log:
* 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 ]
Modified:
subversion/trunk/tools/hook-scripts/mailer/mailer.py
Modified: subversion/trunk/tools/hook-scripts/mailer/mailer.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/mailer/mailer.py?rev=1927078&r1=1927077&r2=1927078&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Tue Jul 8 16:48:26
2025
@@ -1401,8 +1401,9 @@ class Config:
# 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
