From 73232b40e1a76880a4425d7d69ca00a352ce67c8 Mon Sep 17 00:00:00 2001 From: jesopo Date: Mon, 25 Nov 2019 10:43:30 +0000 Subject: new_event doesn't exist when check_success is false --- modules/commands/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/commands/__init__.py') diff --git a/modules/commands/__init__.py b/modules/commands/__init__.py index 0630de7e..af65f0af 100644 --- a/modules/commands/__init__.py +++ b/modules/commands/__init__.py @@ -187,6 +187,8 @@ class Module(ModuleManager.BaseModule): check) event_kwargs["check_assert"] = check_assert + eaten = False + check_success, check_message = self._check("preprocess", event_kwargs) if check_success: new_event = self.events.on(hook.event_name).make_event(**event_kwargs) @@ -196,6 +198,7 @@ class Module(ModuleManager.BaseModule): hook.call(new_event) except utils.EventError as e: stderr.write(str(e)) + eaten = new_event.eaten else: if check_message: stderr.write("%s: %s" % (user.nickname, check_message)) @@ -203,7 +206,7 @@ class Module(ModuleManager.BaseModule): self._check("postprocess", event_kwargs) # postprocess - send stdout/stderr and typing tag - return new_event.eaten + return eaten @utils.hook("postprocess.command") @utils.kwarg("priority", EventManager.PRIORITY_LOW) -- cgit v1.3.1-10-gc9f91