Comparison

prosodyctl @ 5457:953888c31071

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 09 Apr 2013 15:51:08 +0200
parent 5442:e66973c81e89
parent 5456:87204440b9dd
child 5534:522e99b898a0
comparison
equal deleted inserted replaced
5455:16493e410fa8 5457:953888c31071
133 dependencies.log_warnings(); 133 dependencies.log_warnings();
134 134
135 -- Switch away from root and into the prosody user -- 135 -- Switch away from root and into the prosody user --
136 local switched_user, current_uid; 136 local switched_user, current_uid;
137 137
138 local want_pposix_version = "0.3.5"; 138 local want_pposix_version = "0.3.6";
139 local ok, pposix = pcall(require, "util.pposix"); 139 local ok, pposix = pcall(require, "util.pposix");
140 140
141 if ok and pposix then 141 if ok and pposix then
142 if pposix._VERSION ~= want_pposix_version then print(string.format("Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version)); return; end 142 if pposix._VERSION ~= want_pposix_version then print(string.format("Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version)); return; end
143 current_uid = pposix.getuid(); 143 current_uid = pposix.getuid();