diff options
| author | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
| commit | 929103b8672e1395eedd663fb172a91ce197ec33 (patch) | |
| tree | 94b4ebcb9443e8e6751e1903ade3c9dc8ec9d678 /util/datamanager.lua | |
| parent | b22125f0645b3281d99843dcdb7b44e92b9167cd (diff) | |
| parent | cf87960bda697b3727b5b62ab8c983a48b8c5314 (diff) | |
| download | prosody-929103b8672e1395eedd663fb172a91ce197ec33.tar.gz prosody-929103b8672e1395eedd663fb172a91ce197ec33.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util/datamanager.lua')
| -rw-r--r-- | util/datamanager.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua index cf96887b..1c578fee 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -24,7 +24,7 @@ local t_concat = table.concat; local envloadfile = require"util.envload".envloadfile; local serialize = require "util.serialization".serialize; local lfs = require "lfs"; --- Extract directory seperator from package.config (an undocumented string that comes with lua) +-- Extract directory separator from package.config (an undocumented string that comes with lua) local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" ) local prosody = prosody; @@ -157,7 +157,8 @@ end local function atomic_store(filename, data) local scratch = filename.."~"; - local f, ok, msg, errno; + local f, ok, msg, errno; -- luacheck: ignore errno + -- TODO return util.error with code=errno? f, msg, errno = io_open(scratch, "w"); if not f then |