From 588362e104cfd3bdd50e66b7f196c0e2fc7d0f0f Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 4 Jun 2018 17:49:26 -0400 Subject: [PATCH] mediawiki: Handle missing config lines for private mode Formatted with yapf. Signed-off-by: James Valleroy --- actions/mediawiki | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/actions/mediawiki b/actions/mediawiki index ef85c6ff0..65d24de21 100755 --- a/actions/mediawiki +++ b/actions/mediawiki @@ -49,8 +49,10 @@ def parse_arguments(): help=help_pub_reg) help_private_mode = 'Enable/Disable/Status private mode.' - private_mode = subparsers.add_parser('private-mode', help=help_private_mode) - private_mode.add_argument('command', choices=('enable', 'disable', 'status'), + private_mode = subparsers.add_parser('private-mode', + help=help_private_mode) + private_mode.add_argument('command', + choices=('enable', 'disable', 'status'), help=help_private_mode) change_password = subparsers.add_parser('change-password', @@ -191,8 +193,8 @@ def subcommand_private_mode(arguments): read_conf_lines = list(filter(is_read_line, lines)) if arguments.command == 'status': if edit_conf_lines and read_conf_lines: - print('enabled' if ('false' in read_conf_lines[0]) and - ('false' in edit_conf_lines[0]) else 'disabled') + print('enabled' if ('false' in read_conf_lines[0]) and ( + 'false' in edit_conf_lines[0]) else 'disabled') else: print('disabled') else: @@ -206,10 +208,12 @@ def subcommand_private_mode(arguments): else: conf_file.write(line) - if edit_conf_lines is None: - conf_file.write("$wgGroupPermissions['*']['edit'] = " + conf_value + '\n') - if read_conf_lines is None: - conf_file.write("$wgGroupPermissions['*']['read'] = " + conf_value + '\n') + if not edit_conf_lines: + conf_file.write("$wgGroupPermissions['*']['edit'] = " + + conf_value + '\n') + if not read_conf_lines: + conf_file.write("$wgGroupPermissions['*']['read'] = " + + conf_value + '\n') def main():