aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-02-24 15:22:34 +0000
committerMatthew Wild <mwild1@gmail.com>2015-02-24 15:22:34 +0000
commitf7786f4031dad5dd2daaf92c7c099448334d892d (patch)
treebd901b2855478c2157ca69f3a143650499ffe8ea /util
parentab47a2b002478a36645de1ebfbbbad5815aae08b (diff)
parentf9b9268e61a9dd98c9a438ad4ea2c6e6d92128d9 (diff)
downloadprosody-f7786f4031dad5dd2daaf92c7c099448334d892d.tar.gz
prosody-f7786f4031dad5dd2daaf92c7c099448334d892d.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/datamanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 4a4d62b3..b82349f1 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -163,7 +163,7 @@ local function atomic_store(filename, data)
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)