jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404618 )

Change subject: Solve -cc conflict in imagecopy
......................................................................


Solve -cc conflict in imagecopy

imagecopy.py did not support its -cc option because it conflicted with
the global option to toggle cosmetic changes
Renamed the local implementation and added option descriptions

Bug: T182522
Change-Id: I2db4e4ffa313ff3cc043658b3ca3d6d436d65a5b
---
M scripts/imagecopy.py
1 file changed, 12 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Xqt: Looks good to me, approved



diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 7a539b5..6c8a731 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -17,6 +17,16 @@
 so he can test at: [[de:Benutzer Diskussion:Magnus Manske]]. You can
 write him in German and English.
 
+Command line options:
+
+-always      Skip the GUI validation
+
+-setcat:     Set the category of the copied image
+
+-delete      Delete the image after the image has been transferred. This will
+             only work if the user has sysops privileges, otherwise the image
+             will only be marked for deletion.
+
 Examples
 
 Work on a single image::
@@ -494,8 +504,8 @@
     for arg in local_args:
         if arg == '-always':
             always = True
-        elif arg.startswith('-cc:'):
-            category = arg[len('-cc:'):]
+        elif arg.startswith('-setcat:'):
+            category = arg[len('-setcat:'):]
         elif arg == '-delete':
             delete_after_done = True
         else:

-- 
To view, visit https://gerrit.wikimedia.org/r/404618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2db4e4ffa313ff3cc043658b3ca3d6d436d65a5b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to