Skip to content

Commit

Permalink
When using multiple catalogs always the first is chosen.
Browse files Browse the repository at this point in the history
With the introduction of the autoselection of the right catalog when
none is selected we also auto select a catalog in the pool resource.
That is of course wrong as that means every pool always has an
explicit override of the catalog to use to the first catalog which
makes the override in the client useless.

Fixes #229: When using multiple catalogs always the first is chosen.
  • Loading branch information
Marco van Wieringen committed Feb 17, 2015
1 parent f6f9ff5 commit 68e6fa8
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/dird/dird_conf.c
Expand Up @@ -1648,11 +1648,6 @@ void save_resource(int type, RES_ITEM *items, int pass)
res->res_pool.storage = res_all.res_pool.storage;
if (res_all.res_pool.catalog || !res->res_pool.use_catalog) {
res->res_pool.catalog = res_all.res_pool.catalog;
} else {
/*
* No catalog overwrite given use the first catalog definition.
*/
res->res_pool.catalog = (CATRES *)GetNextRes(R_CATALOG, NULL);
}
break;
case R_CONSOLE:
Expand Down

0 comments on commit 68e6fa8

Please sign in to comment.