aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-02-21 10:34:56 +0100
committerKim Alvefur <zash@zash.se>2015-02-21 10:34:56 +0100
commitf67cdc6ec69b95a570784d96371408e29a28dc1d (patch)
treebca3c04192429bf6272572d8178b1588c3d7477d /util
parentb7a38c8c93f8e6bee2579de6b9468fbb68c14589 (diff)
parent158dc0f9e1071b627a4928825e4e22d73785cfe8 (diff)
downloadprosody-f67cdc6ec69b95a570784d96371408e29a28dc1d.tar.gz
prosody-f67cdc6ec69b95a570784d96371408e29a28dc1d.zip
Merge 0.9->0.10
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)