prosody
5cf1c08805fb
core/configmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/configmanager.lua @ 5814:5cf1c08805fb

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 03 Sep 2013 00:20:28 +0100
parent 5776:bd0ff8ae98a8
parent 5811:27ae988f5b70
child 6164:ef4024f6bc40
line wrap: on
line diff
--- a/core/configmanager.lua	Mon Sep 02 15:22:41 2013 +0100
+++ b/core/configmanager.lua	Tue Sep 03 00:20:28 2013 +0100
@@ -77,7 +77,7 @@
 			local is_relative;
 			if path_sep == "/" and path:sub(1,1) ~= "/" then
 				is_relative = true;
-			elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" or path:sub(2,3) ~= ":/")) then
+			elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" and path:sub(2,3) ~= ":/")) then
 				is_relative = true;
 			end
 			if is_relative then