aboutsummaryrefslogtreecommitdiffstats
path: root/util/datamanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 22:31:59 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 22:31:59 +0200
commit870f8edb12cbfd94768cd348c3d7445b58ab0a86 (patch)
treea1194a8507fd6aba43f775983a36e82bbb8c2448 /util/datamanager.lua
parent9bd85eabf029220d25431ab17bc86bf308b51b8d (diff)
parentbbdd807af4b5bb1a5cf78accefa26f7f36e4668f (diff)
downloadprosody-870f8edb12cbfd94768cd348c3d7445b58ab0a86.tar.gz
prosody-870f8edb12cbfd94768cd348c3d7445b58ab0a86.zip
Merge 0.9->0.10
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));