jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361306 ) Change subject: replace.py: do not overwrite exceptions given via CLI ...................................................................... replace.py: do not overwrite exceptions given via CLI Exceptions specified via 'fix' shall not replace those entered via CLI. They should be merged instead. Bug: T142324 Change-Id: If9eb6bed1f4221023658292aa705e31de1611a00 --- M scripts/replace.py 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/replace.py b/scripts/replace.py index 34671fb..4357358 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -1086,9 +1086,15 @@ edit_summary=summary, )) + # Exceptions specified via 'fix' shall be merged to those via CLI. if replacement_set: replacements.extend(replacement_set) - exceptions = replacement_set._exceptions + if replacement_set._exceptions is not None: + for k, v in replacement_set._exceptions.items(): + if k in exceptions: + exceptions[k] = list(set(exceptions[k]) | set(v)) + else: + exceptions[k] = v if len(fix['replacements']) == len(missing_fix_summaries): missing_fixes_summaries.append( -- To view, visit https://gerrit.wikimedia.org/r/361306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9eb6bed1f4221023658292aa705e31de1611a00 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>