diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-11-11 18:20:54 +0100 |
---|---|---|
committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-11-11 20:00:26 +0100 |
commit | 48a2bd04fa5a4095f0a5d8556c8113afb672664d (patch) | |
tree | b776d217eade8b02428cdde5f9c8ddc9c24115b1 /src | |
parent | 268d788ab083467247d2bd91e8ba71c0fc000e1e (diff) |
[bug] fix cli autostart
this reverts the refactoring made at 596f1f8
it seems it is now allowed to call a function that yields from inside as
part of an inline deferred.
Diffstat (limited to 'src')
-rwxr-xr-x | src/leap/bitmask/cli/bitmask_cli.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index e72d1f6..34c2356 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -121,19 +121,15 @@ GENERAL COMMANDS: value + Fore.RESET) -def _check_started(cli): +@defer.inlineCallbacks +def execute(): + cli = BitmaskCLI() cli.data = ['version'] args = ['--verbose'] if '--verbose' in sys.argv else None yield cli._send( timeout=0.1, printer=_null_printer, errb=lambda: cli.start(args)) cli.data = [] - - -@defer.inlineCallbacks -def execute(): - cli = BitmaskCLI() - _check_started(cli) yield cli.execute(sys.argv[1:]) try: yield reactor.stop() |