jenkins-bot has submitted this change and it was merged.

Change subject: [BREAK] Solve -user argument conflict ......................................................................

[BREAK] Solve -user argument conflict

-user is a global option; rename the local implementation

Bug: T87635 Change-Id: Ifb07f1e0d2ddc0e7cb780e21565cdaa04860c5d2 --- M scripts/template.py 1 file changed, 8 insertions(+), 8 deletions(-)

Approvals: John Vandenberg: Looks good to me, approved Mpaa: Looks good to me, but someone else must approve jenkins-bot: Verified

diff --git a/scripts/template.py b/scripts/template.py index fba031c..783da18 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -29,13 +29,13 @@ info will be loaded from the maintenance page of the live wiki. argument can also be given as "-xml:filename.xml".

--user: Only process pages edited by a given user +-onlyuser: Only process pages edited by a given user

-skipuser: Only process pages not edited by a given user

--timestamp: (With -user or -skipuser). Only check for a user where his edit is - not older than the given timestamp. Timestamp must be writen in - MediaWiki timestamp format which is "%Y%m%d%H%M%S" +-timestamp: (With -onlyuser or -skipuser). Only check for a user where his + edit is not older than the given timestamp. Timestamp must be + writen in MediaWiki timestamp format which is "%Y%m%d%H%M%S". If this parameter is missed, all edits are checked but this is restricted to the last 100 edits.

@@ -102,8 +102,8 @@ # # (C) Daniel Herding, 2004 # (C) Rob W.W. Hooft, 2003-2005 -# (C) xqt, 2009-2015 -# (C) Pywikibot team, 2004-2015 +# (C) xqt, 2009-2016 +# (C) Pywikibot team, 2004-2016 # # Distributed under the terms of the MIT license. # @@ -301,8 +301,8 @@ options['addedCat'] = arg[len('-addcat:'):] elif arg.startswith('-summary:'): options['summary'] = arg[len('-summary:'):] - elif arg.startswith('-user:'): - user = arg[len('-user:'):] + elif arg.startswith('-onlyuser:'): + user = arg[len('-onlyuser:'):] elif arg.startswith('-skipuser:'): user = arg[len('-skipuser:'):] skip = True