emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't warn about removed services through use of the nosys keyword.

Browse Source
This commit is contained in:
Roy Marples 2008-02-19 22:04:24 +00:00
parent f35f788187
commit 7dec6f4025
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/librc/librc-depend.c
View File

@ -740,6 +740,7 @@ bool rc_deptree_update (void)
rc_deptype_t *deptype = NULL; rc_deptype_t *deptype = NULL;
rc_deptype_t *dt; rc_deptype_t *dt;
rc_deptype_t *last_deptype = NULL; rc_deptype_t *last_deptype = NULL;
char **removedp = NULL;
char *line; char *line;
size_t len; size_t len;
size_t i; size_t i;
@ -878,8 +879,8 @@ next:
nosys[i + 2] = '\0'; nosys[i + 2] = '\0';
last_depinfo = NULL; last_depinfo = NULL;
for (depinfo = deptree; depinfo; depinfo = depinfo->next) depinfo = deptree;
{ while (depinfo) {
bool removed = false; bool removed = false;
if ((deptype = get_deptype (depinfo, "keyword"))) { if ((deptype = get_deptype (depinfo, "keyword"))) {
STRLIST_FOREACH (deptype->services, service, i) STRLIST_FOREACH (deptype->services, service, i)
@ -893,14 +894,22 @@ next:
} }
} }
if (removed) { if (removed) {
dt = get_deptype (depinfo, "iprovide");
if (dt)
STRLIST_FOREACH (dt->services, service, i)
rc_strlist_addu (&removedp, service);
for (di = deptree; di; di = di->next) { for (di = deptree; di; di = di->next) {
for (dt = di->depends; dt; dt = dt->next) for (dt = di->depends; dt; dt = dt->next)
rc_strlist_delete (&dt->services, depinfo->service); rc_strlist_delete (&dt->services, depinfo->service);
} }
di = depinfo->next;
depinfo->next = NULL; depinfo->next = NULL;
rc_deptree_free (depinfo); rc_deptree_free (depinfo);
} else depinfo = di;
} else {
last_depinfo = depinfo; last_depinfo = depinfo;
depinfo = depinfo->next;
}
} }
free (nosys); free (nosys);
@ -943,9 +952,17 @@ next:
{ {
if (strcmp (deptype->type, "ineed") == 0) if (strcmp (deptype->type, "ineed") == 0)
{ {
fprintf (stderr, bool removed = false;
"Service `%s' needs non existant service `%s'\n", STRLIST_FOREACH (removedp, line, k) {
depinfo->service, service); if (strcmp (line, service) == 0) {
removed = true;
break;
}
}
if (! removed)
fprintf (stderr,
"Service `%s' needs non existant service `%s'\n",
depinfo->service, service);
} }
continue; continue;
} }
@ -1033,6 +1050,7 @@ next:
rc_strlist_free (config); rc_strlist_free (config);
} }
rc_strlist_free (removedp);
rc_deptree_free (deptree); rc_deptree_free (deptree);
return (retval); return (retval);