# # # patch "database.cc" # from [17a4e7f5bce4cbe492b4e9e2bf5533f589e1fcc2] # to [84f663862dc6a081e02c39a7b6186ccd9d9fa520] # ============================================================ --- database.cc 17a4e7f5bce4cbe492b4e9e2bf5533f589e1fcc2 +++ database.cc 84f663862dc6a081e02c39a7b6186ccd9d9fa520 @@ -4725,7 +4725,7 @@ database_path_helper::get_database_path( vector candidates; vector search_paths; - E(lua.hook_get_default_database_locations(search_paths) || search_paths.size() == 0, + E(lua.hook_get_default_database_locations(search_paths) && search_paths.size() > 0, origin::user, F("could not query default database locations")); for (vector::const_iterator i = search_paths.begin(); @@ -4783,7 +4783,7 @@ database_path_helper::maybe_set_default_ } string alias; - E(lua.hook_get_default_database_alias(alias) || alias.empty(), + E(lua.hook_get_default_database_alias(alias) && !alias.empty(), origin::user, F("could not query default database alias")); opts.dbname_given = true;