# HG changeset patch # User jbe # Date 1497231143 -7200 # Node ID 5b1c4f76e44fb8877726f350591fe688a82df415 # Parent 91d0c8304d74c61721d83f214ab0845d493c732a Pass poll message to abort_handler of execute.command{...} diff -r 91d0c8304d74 -r 5b1c4f76e44f framework/env/execute/command.lua --- a/framework/env/execute/command.lua Mon Jun 12 03:18:54 2017 +0200 +++ b/framework/env/execute/command.lua Mon Jun 12 03:32:23 2017 +0200 @@ -35,7 +35,7 @@ if args.abortable then local pollready, pollmsg, pollterm = poll(nil, nil, 0, true) if pollterm then - if args.abort_handler then args.abort_handler() end + if args.abort_handler then args.abort_handler(pollmsg) end return_error(pollmsg) end end @@ -71,7 +71,7 @@ if not pollready then process:kill():wait() if pollterm then - if args.abort_handler then args.abort_handler() end + if args.abort_handler then args.abort_handler(pollmsg) end else if args.timeout_handler then args.timeout_handler() end end