From f083a3b67b134b4ca28710706df4f203e5e0ed2f Mon Sep 17 00:00:00 2001 From: John Garland Date: Mon, 28 May 2012 00:35:14 +1000 Subject: [PATCH] Ensure console commands are executed in order --- deluge/ui/console/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index f6653061e..96f6286ae 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -168,16 +168,16 @@ class ConsoleUI(component.Component): def on_started(result): if not self.interactive: def on_started(result): - deferreds = [] + def do_command(result, cmd): + return self.do_command(cmd) + + d = defer.succeed(None) # If we have args, lets process them and quit # allow multiple commands split by ";" for arg in args.split(";"): - deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) + d.addCallback(do_command, arg.strip()) - def on_complete(result): - self.do_command("quit") - - dl = defer.DeferredList(deferreds).addCallback(on_complete) + d.addCallback(do_command, "quit") # We need to wait for the rpcs in start() to finish before processing # any of the commands.