Comparison

core/storagemanager.lua @ 5511:764bda4b28b8

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 23 Apr 2013 15:14:47 +0100
parent 5502:c773aa4467f1
child 5776:bd0ff8ae98a8
comparison
equal deleted inserted replaced
5497:b42781a96174 5511:764bda4b28b8
84 local driver, driver_name = get_driver(host, store); 84 local driver, driver_name = get_driver(host, store);
85 local ret, err = driver:open(store, typ); 85 local ret, err = driver:open(store, typ);
86 if not ret then 86 if not ret then
87 if err == "unsupported-store" then 87 if err == "unsupported-store" then
88 log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver", 88 log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
89 driver_name, store, typ); 89 driver_name, store, typ or "<nil>");
90 ret = null_storage_driver; 90 ret = null_storage_driver;
91 err = nil; 91 err = nil;
92 end 92 end
93 end 93 end
94 return ret, err; 94 return ret, err;