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

distromatic.c: indentation fixes

Browse Source
This commit is contained in:
Silvan Calarco 2021-03-20 12:21:11 +01:00
parent 04d323e9a7
commit 7d07afc0cc
1 changed files with 270 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/distromatic.c
View File

@ -456,11 +456,11 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
currheader = currheader->next;
continue;
}
// currheader->require.resolved = malloc(sizeof(struct providedList*)*currheader->requirecount);
// currheader->require.resolved = malloc(sizeof(struct providedList*)*currheader->requirecount);
for (i = 0; i < currheader->requirecount; i++) {
if (!strncmp("executable(",currheader->require[i]->name,11)) {
/* dynamic requirement for executable file */
/* fprintf(stderr,"Warning: skipping unhandled requirement %s for package %s\n",
/*fprintf(stderr,"Warning: skipping unhandled requirement %s for package %s\n",
currheader->require[i]->name,currheader->name);*/
currheader->require[i]->resolved=NULL;
} else if (strncmp("rpmlib(",currheader->require[i]->name,7) &&
@ -470,7 +470,6 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
if (provided->numproviders == 0) {
// check if require[i]->name requirement is met
scanheader = ct->headerlist[archidx];
if ((currheader->require[i]->name)[0] == '/') {
/* requirement is a file, find who provides it */
file=findOrCreateFileTreeEntry(&ct->filetree[archidx],currheader->require[i]->name, archidx);
@ -485,10 +484,9 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
}
} else {
/* requirement is not a file, cross-check with provides */
while (scanheader &&
!checkRequireWithProvides(
currheader->require[i]->name,
scanheader)) scanheader = scanheader->next;
while (scanheader && !checkRequireWithProvides(
currheader->require[i]->name, scanheader))
scanheader = scanheader->next;
if (scanheader) {
provided->numproviders=1;
provided->numbuildproviders=0;
@ -588,7 +586,6 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
}
}
}
if (provided->numproviders > 0) {
if (strcmp(currheader->require[i]->version,"") &&
(currheader->require[i]->flags & (RPMSENSE_LESS|RPMSENSE_GREATER|RPMSENSE_EQUAL))) {
@ -648,9 +645,12 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
provided->provider[j]->arch,
ct->repository[provided->provider[j]->altrepository]->tag,
provided->name);
if (currheader->require[i]->flags & RPMSENSE_LESS) snprintf(&warning[strlen(warning)], PATH_MAX,"<");
if (currheader->require[i]->flags & RPMSENSE_GREATER) snprintf(&warning[strlen(warning)], PATH_MAX, ">");
if (currheader->require[i]->flags & RPMSENSE_EQUAL) snprintf(&warning[strlen(warning)], PATH_MAX, "=");
if (currheader->require[i]->flags & RPMSENSE_LESS)
snprintf(&warning[strlen(warning)], PATH_MAX,"<");
if (currheader->require[i]->flags & RPMSENSE_GREATER)
snprintf(&warning[strlen(warning)], PATH_MAX, ">");
if (currheader->require[i]->flags & RPMSENSE_EQUAL)
snprintf(&warning[strlen(warning)], PATH_MAX, "=");
snprintf(&warning[strlen(warning)], PATH_MAX, "%s to %s(%s,%s)",
currheader->require[i]->version,
currheader->name,
@ -674,8 +674,8 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
currheader->require[i]->resolved=provided;
} else {
currheader->require[i]->resolved=NULL;
}
}
} /* if */
} /* for currheader->requirecount */
// sort required list by first provider's name
qsort((void *) &currheader->require[0],
currheader->requirecount,