diff --git a/src/wormhole/cli/cmd_send.py b/src/wormhole/cli/cmd_send.py index aaa27cc..353e138 100644 --- a/src/wormhole/cli/cmd_send.py +++ b/src/wormhole/cli/cmd_send.py @@ -86,7 +86,8 @@ class Sender: print(u"", file=args.stdout) key_established = yield w.establish_key() - print(u"Key established, waiting for confirmation...") + print(u"Key established, waiting for confirmation...", + file=args.stdout) # TODO: don't stall on w.verify() unless they want it verifier_bytes = yield w.verify() # this may raise WrongPasswordError diff --git a/src/wormhole/wormhole.py b/src/wormhole/wormhole.py index d783e14..fcb1719 100644 --- a/src/wormhole/wormhole.py +++ b/src/wormhole/wormhole.py @@ -289,7 +289,7 @@ class _Wormhole: returns a Deferred that fires when we've established the shared key. When successful, the Deferred fires with a simple `True`, otherwise it fails. - + """ return self._API_establish_key() @@ -852,6 +852,9 @@ class _Wormhole: if self._verifier_waiter and not self._verifier_waiter.called: if self.DEBUG: print("EB VW") self._verifier_waiter.errback(error) + if self._key_waiter and not self._key_waiter.called: + if self.DEBUG: print("EB KW") + self._key_waiter.errback(error) for d in self._receive_waiters.values(): if self.DEBUG: print("EB RW") d.errback(error)