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

Change subject: Allow automatic cmdline mode with wikipedia:en
......................................................................


Allow automatic cmdline mode with wikipedia:en

2b07db2 allowed command line arguments for -family and -lang
to put generate_user_files into automatic generation mode.
However it didnt detect when -family:wikipedia -lang:en
was used, as this was the default before arguments were parsed.

Change-Id: I34fc2c0553e742bb487baef59142e5ddee6051e6
---
M generate_user_files.py
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/generate_user_files.py b/generate_user_files.py
index 7c99c11..8abd8c5 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -341,9 +341,6 @@
     @type args: list of unicode
     """
     global base_dir
-    # Force default
-    if config.family == 'wikipedia' and config.mylang == 'language':
-        config.mylang = 'en'
 
     default_args = (config.family, config.mylang, None)
 
@@ -361,6 +358,10 @@
     else:
         force = False
 
+    # Force default
+    if config.family == 'wikipedia' and config.mylang == 'language':
+        args = ('wikipedia', 'en', username)
+
     while not force or config.verbose_output:
         pywikibot.output(u'\nYour default user directory is "%s"' % base_dir)
         if pywikibot.input_yn("Do you want to use that directory?",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34fc2c0553e742bb487baef59142e5ddee6051e6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to