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

Identation fixes

Browse Source
This commit is contained in:
Silvan Calarco 2021-03-12 17:34:15 +01:00
parent 10e111f785
commit 4891e1f7ec
1 changed files with 97 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/distromatic.c
View File

@ -712,16 +712,12 @@ resolveFirstLevelSourceDependencies(struct configTag *ct, int archidx)
currsourceheader->requirelist = NULL; currsourceheader->requirelist = NULL;
// currsourceheader->require.resolved = malloc(sizeof(struct providedList*)*currsourceheader->requirecount); // currsourceheader->require.resolved = malloc(sizeof(struct providedList*)*currsourceheader->requirecount);
for (i = 0; i < currsourceheader->requirecount; i++) { for (i = 0; i < currsourceheader->requirecount; i++) {
/* if (strncmp("a2ps",currsourceheader->name,4) == 0) {
fprintf(stderr,"a2ps:%s\n",currheader->require[i]->name);
}*/
if (strncmp("rpmlib(",currsourceheader->require[i]->name,7) && if (strncmp("rpmlib(",currsourceheader->require[i]->name,7) &&
strncmp("debuginfo(build-id)",currsourceheader->require[i]->name,20)) { strncmp("debuginfo(build-id)",currsourceheader->require[i]->name,20)) {
provided=findOrCreateProvidedListEntry((struct providedList**) &ct->providedlist_idx[archidx], provided=findOrCreateProvidedListEntry((struct providedList**) &ct->providedlist_idx[archidx],
currsourceheader->require[i]->name,1,archidx); currsourceheader->require[i]->name,1,archidx);
if (provided->numbuildproviders == 0) { if (provided->numbuildproviders == 0) {
// check if require[i]->name requirement is met // check if require[i]->name requirement is met
if ((currsourceheader->require[i]->name)[0] == '/') { if ((currsourceheader->require[i]->name)[0] == '/') {
/* requirement is a file, find who provides it */ /* requirement is a file, find who provides it */
file=findOrCreateFileTreeEntry(&ct->filetree[archidx],currsourceheader->require[i]->name, archidx); file=findOrCreateFileTreeEntry(&ct->filetree[archidx],currsourceheader->require[i]->name, archidx);
@ -799,7 +795,6 @@ resolveFirstLevelSourceDependencies(struct configTag *ct, int archidx)
fprintf(stderr,")\n"); fprintf(stderr,")\n");
} }
} }
} }
} }
currsourceheader->require[i]->resolved=provided; currsourceheader->require[i]->resolved=provided;
@ -807,7 +802,6 @@ resolveFirstLevelSourceDependencies(struct configTag *ct, int archidx)
currsourceheader->require[i]->resolved=NULL; currsourceheader->require[i]->resolved=NULL;
} }
} }
// sort required list by first provider's name // sort required list by first provider's name
qsort((void *) &currsourceheader->require[0], qsort((void *) &currsourceheader->require[0],
currsourceheader->requirecount, currsourceheader->requirecount,