Skip to content

[Fix] Reinstate ordering of arguments #8971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sercuzz8 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

[Fix] Reinstate ordering of arguments #8971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion bin/storm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,23 @@ def monitor(args):
extrajars=[USER_CONF_DIR, STORM_BIN_DIR])


def merge_args_preserving_order(sys_args, known_args, unknown_args):
#Recombine main_args and unknown_args in the order they originally appeared in sys_args.

known_args = list(known_args)
unknown_args = list(unknown_args)
merged = []
ki = ui = 0
for token in sys_args:
if ki < len(known_args) and known_args[ki] == token:
merged.append(token)
ki += 1
elif ui < len(unknown_args) and unknown_args[ui] == token:
merged.append(token)
ui += 1
return merged


def main():
init_storm_env()
storm_parser = initialize_main_command()
Expand All @@ -1433,7 +1450,7 @@ def main():
sys.exit(1)
raw_args, unknown_args = storm_parser.parse_known_args()
if hasattr(raw_args, "main_args"):
raw_args.main_args += unknown_args
raw_args.main_args = merge_args_preserving_order(sys.argv, raw_args.main_args, unknown_args)
raw_args.func(raw_args)


Expand Down
Loading