projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec8eb2e
)
prosodyctl: Import LuaSocket to a local, don't assume that a global will be set
author
Kim Alvefur
<zash@zash.se>
Fri, 13 Mar 2015 19:12:12 +0000
(20:12 +0100)
committer
Kim Alvefur
<zash@zash.se>
Fri, 13 Mar 2015 19:12:12 +0000
(20:12 +0100)
prosodyctl
patch
|
blob
|
history
diff --git
a/prosodyctl
b/prosodyctl
index a67f3dbde964bb4a787a437327105bfaa0cb57a2..0a4491bff119a1fb824bfc8496d023e2dd3ebd57 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-244,7
+244,7
@@
end
local modulemanager = require "core.modulemanager"
local prosodyctl = require "util.prosodyctl"
-require "socket"
+
local socket =
require "socket"
-----------------------
-- FIXME: Duplicate code waiting for util.startup