Only add quit to deluge-console args if it isn't already present

This prevents an error from being raised due to trying to stop
a reactor which is no longer running
This commit is contained in:
John Garland 2012-05-30 09:15:09 +10:00
parent f083a3b67b
commit 85cdbec10d

View File

@ -174,10 +174,12 @@ class ConsoleUI(component.Component):
d = defer.succeed(None)
# If we have args, lets process them and quit
# allow multiple commands split by ";"
for arg in args.split(";"):
d.addCallback(do_command, arg.strip())
commands = [arg.strip() for arg in args.split(';')]
for command in commands:
d.addCallback(do_command, command)
d.addCallback(do_command, "quit")
if "quit" not in commands:
d.addCallback(do_command, "quit")
# We need to wait for the rpcs in start() to finish before processing
# any of the commands.