Comparison

prosodyctl @ 13059:a47bd6ea7626

Merge 0.12->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Apr 2023 16:00:23 +0100
parent 12971:7214baed9e9d
parent 13057:20b1526772d2
child 13167:6226f75f55a7
comparison
equal deleted inserted replaced
13058:766152afc1c9 13059:a47bd6ea7626
678 elseif type(ret) == "string" then 678 elseif type(ret) == "string" then
679 show_message(ret); 679 show_message(ret);
680 end 680 end
681 os.exit(0, true); -- :) 681 os.exit(0, true); -- :)
682 else 682 else
683 show_message("Failed to execute command: "..error_messages[ret]); 683 show_message("Failed to execute command: %s", error_messages[ret]);
684 os.exit(1); -- :( 684 os.exit(1); -- :(
685 end 685 end
686 end 686 end
687 687
688 if command and not commands[command] then 688 if command and not commands[command] then