Skip to content
Snippets Groups Projects
Commit 724edcd8 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

[WIP] allow to switch between trees

parent 391c1b20
No related branches found
No related tags found
No related merge requests found
...@@ -141,7 +141,7 @@ int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *aresle ...@@ -141,7 +141,7 @@ int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *aresle
} else if (info->opt_tree) { } else if (info->opt_tree) {
/* -t option was used */ /* -t option was used */
if (strcmp(info->treename.s, atree)) if (strcmp(info->treename.s, atree))
log_die(LOG_EXIT_SYS,"you can not enable again a service already set on another tree -- current: ", atree, " asked: ", info->treename.s, ". Try first to disable it") ; log_warn("service: ", svname, " is already parsed at tree: ", atree, " -- switching it to tree: ", info->treename.s) ;
} }
...@@ -220,6 +220,7 @@ int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *aresle ...@@ -220,6 +220,7 @@ int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *aresle
res.dependencies.depends = resolve_add_string(wres, res.sa.s + res.dependencies.optsdeps) ; res.dependencies.depends = resolve_add_string(wres, res.sa.s + res.dependencies.optsdeps) ;
} }
res.dependencies.ndepends += res.dependencies.noptsdeps ;
} }
/** We take the dependencies in two case: /** We take the dependencies in two case:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment