From 758969b078d24aefc840c10351bd2f406bc04ad6 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Fri, 22 May 2020 15:28:34 +1100
Subject: [PATCH] pick the field to check in function of the service type
---
src/lib66/ss_resolve.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib66/ss_resolve.c b/src/lib66/ss_resolve.c
index 4653d180..74d8cb4c 100644
--- a/src/lib66/ss_resolve.c
+++ b/src/lib66/ss_resolve.c
@@ -997,13 +997,15 @@ int ss_resolve_add_rdeps(genalloc *tokeep, ss_resolve_t *res, char const *src)
}
if ((res->type == TYPE_BUNDLE || res->type == TYPE_MODULE) && res->ndeps)
{
- if (!sastr_clean_string(&tmp,res->sa.s + res->deps)) goto err ;
+ uint32_t deps = res->type == TYPE_MODULE ? res->contents : res->deps ;
+ if (!sastr_clean_string(&tmp,res->sa.s + deps)) goto err ;
ss_resolve_t dres = RESOLVE_ZERO ;
for (; a < tmp.len ; a += strlen(tmp.s + a) + 1)
{
char *name = tmp.s + a ;
if (!ss_resolve_check(src,name)) goto err ;
if (!ss_resolve_read(&dres,src,name)) goto err ;
+ if (dres.type == TYPE_CLASSIC) continue ;
if (!ss_resolve_cmp(tokeep,name))
{
if (!ss_resolve_append(tokeep,&dres)) goto err ;
--
GitLab