Software / code / prosody
Changeset
12453:1ec4a3a61cf7
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 05 Apr 2022 19:49:18 +0200 |
| parents | 12451:76887863a6ae (current diff) 12452:c475a7802169 (diff) |
| children | 12455:e703a9d71360 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Mon Apr 04 19:10:05 2022 +0200 +++ b/prosodyctl Tue Apr 05 19:49:18 2022 +0200 @@ -115,11 +115,17 @@ show_usage([[list]], [[Shows installed rocks]]); return 0; end + local server = opts.server or configmanager.get("*", "plugin_server"); if opts.outdated then -- put this back for luarocks arg[1] = "--outdated"; + + if not server then + show_warning("There is no 'plugin_server' option in the configuration file, but this is needed for 'list --outdated' to work."); + return 1; + end end - local ret = call_luarocks("list", arg[1]); + local ret = call_luarocks("list", arg[1], server); return ret; end
