From 724edcd8e2749a25f7b049f463fafc58e8a584b0 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Mon, 30 Jan 2023 01:18:18 +1100
Subject: [PATCH] [WIP] allow to switch between trees
---
src/lib66/parse/parse_frontend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib66/parse/parse_frontend.c b/src/lib66/parse/parse_frontend.c
index 0770a230..fb63bdc5 100644
--- a/src/lib66/parse/parse_frontend.c
+++ b/src/lib66/parse/parse_frontend.c
@@ -141,7 +141,7 @@ int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *aresle
} else if (info->opt_tree) {
/* -t option was used */
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
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:
--
GitLab