aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 21:44:13 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 21:44:13 +0200
commit4beb76ca0d38cb1cb04fb3880599e82d5e12d88b (patch)
treee029296b2697abfa1d3b9a448fe51e725dadf507
parent9906fca5ac6d6fff63e36b1e785796cdf9dbc3d6 (diff)
downloadprosody-4beb76ca0d38cb1cb04fb3880599e82d5e12d88b.tar.gz
prosody-4beb76ca0d38cb1cb04fb3880599e82d5e12d88b.zip
util.datamanager: Fix traceback from trying to purge when storage is empty or otherwise unaccessible (fixes #496)
-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));