openmamba/distromatic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reports.c: remove complex deps from deps-* files

Browse Source
This commit is contained in:
Silvan Calarco 2021-04-07 15:05:52 +02:00
parent 5136ee98b9
commit 57c93b2591
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/reports.c
View File

@ -1760,7 +1760,8 @@ int print_datatables(struct configTag *ct, int arch) {
logmsg(LOG_DEBUG,"writing deps files (1)"); logmsg(LOG_DEBUG,"writing deps files (1)");
struct providedList* provided = ct->providedlist_idx[arch][0]; struct providedList* provided = ct->providedlist_idx[arch][0];
while (provided) { while (provided) {
if (!strncmp("debuginfo(build-id)", provided->name, 20)) { if (!strncmp("debuginfo(build-id)", provided->name, 20) ||
provided->name[0] == '(') { // Filter out complex deps like "(name >= ver1 with name < ver2)
provided = provided->next; provided = provided->next;
continue; continue;
} }
@ -1840,8 +1841,12 @@ int print_datatables(struct configTag *ct, int arch) {
for (i = 0; i < currheaderlist->requirecount; i++) { for (i = 0; i < currheaderlist->requirecount; i++) {
if (currheaderlist->require[i]->resolved) { if (currheaderlist->require[i]->resolved) {
if (currheaderlist->require[i]->resolved->numproviders == 0) { if (currheaderlist->require[i]->resolved->numproviders == 0) {
fprintf_depstable_filtered_var(fd,currheaderlist->require[i]->resolved->name); // Filter out complex deps like "(name >= ver1 with name < ver2)
fprintf(fd,"_unresolved_ "); if (currheaderlist->require[i]->resolved->name[0] != '(') {
fprintf_depstable_filtered_var(fd,
currheaderlist->require[i]->resolved->name);
fprintf(fd,"_unresolved_ ");
}
} else if (currheaderlist->require[i]->resolved->numproviders == 1) { } else if (currheaderlist->require[i]->resolved->numproviders == 1) {
if ((i == 0 || if ((i == 0 ||
!currheaderlist->require[i-1]->resolved || !currheaderlist->require[i-1]->resolved ||