From 1b3fcf80194e81cafd571d9f04398ba2e89d187f Mon Sep 17 00:00:00 2001 From: ProDigySML Date: Sun, 3 Feb 2019 16:44:52 -0800 Subject: [PATCH 1/2] Fixed issue where ports was required --- Interlace/lib/core/input.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Interlace/lib/core/input.py b/Interlace/lib/core/input.py index 7d79114..deff1e3 100644 --- a/Interlace/lib/core/input.py +++ b/Interlace/lib/core/input.py @@ -178,12 +178,12 @@ class InputHelper(object): for command in arguments.command_list: commands.add(command.strip()) - if arguments.port: - final_commands = InputHelper._replace_variable_for_commands(commands, "_port_", ports) - - final_commands = InputHelper._replace_variable_for_commands(final_commands, "_target_", targets) + final_commands = InputHelper._replace_variable_for_commands(commands, "_target_", targets) final_commands = InputHelper._replace_variable_for_commands(final_commands, "_host_", targets) + if arguments.port: + final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", ports) + if arguments.realport: final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", real_ports) From 72dedbb7b94b9968e6d029b5a09817be4a534661 Mon Sep 17 00:00:00 2001 From: ProDigySML Date: Sun, 3 Feb 2019 16:45:18 -0800 Subject: [PATCH 2/2] Fixed issue where realports wasn't being replaced --- Interlace/lib/core/input.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interlace/lib/core/input.py b/Interlace/lib/core/input.py index deff1e3..d0edce8 100644 --- a/Interlace/lib/core/input.py +++ b/Interlace/lib/core/input.py @@ -185,7 +185,7 @@ class InputHelper(object): final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", ports) if arguments.realport: - final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", real_ports) + final_commands = InputHelper._replace_variable_for_commands(final_commands, "_realport_", real_ports) if arguments.output: final_commands = InputHelper._replace_variable_for_commands(final_commands, "_output_", [arguments.output])