diff --git a/tools/network_emulator/emulate.py b/tools/network_emulator/emulate.py index beaaf60069..1c2cf3aaad 100755 --- a/tools/network_emulator/emulate.py +++ b/tools/network_emulator/emulate.py @@ -154,7 +154,7 @@ def _main(): try: emulator.check_permissions() except network_emulator.NetworkEmulatorError as e: - logging.error('Error: %s\n\nCause: %s', e.msg, e.error) + logging.error('Error: %s\n\nCause: %s', e.fail_msg, e.error) return -1 if not options.target_ip: @@ -186,7 +186,7 @@ def _main(): logging.info('Completed Network Emulation.') return 0 except network_emulator.NetworkEmulatorError as e: - logging.error('Error: %s\n\nCause: %s', e.msg, e.error) + logging.error('Error: %s\n\nCause: %s', e.fail_msg, e.error) return -2 if __name__ == '__main__': diff --git a/tools/network_emulator/network_emulator.py b/tools/network_emulator/network_emulator.py index 08d8255929..2531f1ed8c 100644 --- a/tools/network_emulator/network_emulator.py +++ b/tools/network_emulator/network_emulator.py @@ -97,7 +97,7 @@ class NetworkEmulator(object): # AttributeError will be raised on Windows. if ctypes.windll.shell32.IsUserAnAdmin() == 0: raise NetworkEmulatorError('You must run this script with administrator' - 'privileges.') + ' privileges.') def _create_dummynet_rule(self, pipe_id, from_address, to_address, port_range): @@ -169,7 +169,7 @@ def _run_ipfw_command(command, fail_msg=None): fail_msg: Message describing the error in case the command fails. Raises: - NetworkEmulatorError: If command fails. Message is set by the fail_msg + NetworkEmulatorError: If command fails a message is set by the fail_msg parameter. """ if sys.platform == 'win32':