aboutsummaryrefslogtreecommitdiffstats
path: root/util/datamanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 22:33:40 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 22:33:40 +0200
commit068e6374d06f4ba750195da7f6212a1a6ac72636 (patch)
tree158e57da633fa8d8553805dcd190a93b767d7f9a /util/datamanager.lua
parenta885794fccabfc6dc8cc8e52f83c8ac865ddd8c8 (diff)
parent6e1bf7233685953e586445fc812c84927b6ae990 (diff)
downloadprosody-068e6374d06f4ba750195da7f6212a1a6ac72636.tar.gz
prosody-068e6374d06f4ba750195da7f6212a1a6ac72636.zip
Merge 0.10->trunk
Diffstat (limited to 'util/datamanager.lua')
-rw-r--r--util/datamanager.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index b4138638..a107d95c 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -348,8 +348,12 @@ end
function purge(username, host)
local host_dir = format("%s/%s/", data_path, encode(host));
+ local ok, iter, state, var = pcall(lfs.dir, host_dir);
+ if not ok then
+ return ok, iter;
+ end
local errs = {};
- for file in lfs.dir(host_dir) do
+ for file in iter, state, var do
if lfs.attributes(host_dir..file, "mode") == "directory" then
local store = decode(file);
local ok, err = do_remove(getpath(username, host, store));