Diff

util/datamanager.lua @ 6581:f2a7ad099e01

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Feb 2015 15:22:34 +0000
parent 6575:bdaadf70a48f
child 6644:6cb6855f60df
line wrap: on
line diff
--- a/util/datamanager.lua	Mon Feb 23 00:30:01 2015 +0000
+++ b/util/datamanager.lua	Tue Feb 24 15:22:34 2015 +0000
@@ -163,7 +163,7 @@
 	return nil, msg;
 end
 
-if prosody.platform ~= "posix" then
+if prosody and prosody.platform ~= "posix" then
 	-- os.rename does not overwrite existing files on Windows
 	-- TODO We could use Transactional NTFS on Vista and above
 	function atomic_store(filename, data)