aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authormatthew <matthew@silver>2009-09-05 23:01:06 +0100
committermatthew <matthew@silver>2009-09-05 23:01:06 +0100
commit62ef87bb8fd695c0c63fd07b83dee477d7b365d6 (patch)
tree70ae38642101513d0c888d2c7f840a60cf686d0c /util
parentb4fa86acea319d65c8866accf38dd870e5d381aa (diff)
parentc1e71bdec84a2ac4c5ab5bca75854a9e36464612 (diff)
downloadprosody-62ef87bb8fd695c0c63fd07b83dee477d7b365d6.tar.gz
prosody-62ef87bb8fd695c0c63fd07b83dee477d7b365d6.zip
Merge with 0.5
Diffstat (limited to 'util')
-rw-r--r--util/datamanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index dcc35bb5..4d07d6cc 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -137,7 +137,7 @@ function store(username, host, datastore, data)
append(f, data);
f:close();
if next(data) == nil then -- try to delete empty datastore
- log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+ log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
os_remove(getpath(username, host, datastore));
end
-- we write data even when we are deleting because lua doesn't have a
@@ -179,7 +179,7 @@ function list_store(username, host, datastore, data)
end
f:close();
if next(data) == nil then -- try to delete empty datastore
- log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+ log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
os_remove(getpath(username, host, datastore, "list"));
end
-- we write data even when we are deleting because lua doesn't have a