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
commitc166ec17c2c8bf911877b5810de2555a50afe3ef (patch)
treebd901b2855478c2157ca69f3a143650499ffe8ea /util
parent01a5895abafc01cde29b8ccac63137af370caa27 (diff)
parenta65615d8f2430de97cb1c426a018f84e3c2d6f99 (diff)
downloadprosody-c166ec17c2c8bf911877b5810de2555a50afe3ef.tar.gz
prosody-c166ec17c2c8bf911877b5810de2555a50afe3ef.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)