Changeset

2562:f321211978f6

util.dependencies: Don't query the config (it isn't really necessary)
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Feb 2010 13:52:01 +0000
parents 2561:e7bec4072c61
children 2563:1ede33f50ab4
files util/dependencies.lua
diffstat 1 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/util/dependencies.lua	Sun Jan 31 19:58:52 2010 +0000
+++ b/util/dependencies.lua	Fri Feb 05 13:52:01 2010 +0000
@@ -73,15 +73,11 @@
 	local ssl = softreq "ssl"
 	
 	if not ssl then
-		if config.get("*", "core", "run_without_ssl") then
-			log("warn", "Running without SSL support because run_without_ssl is defined in the config");
-		else
-			missingdep("LuaSec", {
-					["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
-					["luarocks"] = "luarocks install luasec";
-					["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
-				}, "SSL/TLS support will not be available");
-		end
+		missingdep("LuaSec", {
+				["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
+				["luarocks"] = "luarocks install luasec";
+				["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
+			}, "SSL/TLS support will not be available");
 	else
 		local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
 		if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then