Fixes to report files
This commit is contained in:
parent
378aedbdbe
commit
28ace51262
@ -465,7 +465,8 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
|
|||||||
/* 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]->name,currheader->name);*/
|
||||||
currheader->require[i]->resolved=NULL;
|
currheader->require[i]->resolved=NULL;
|
||||||
} else if (strncmp("rpmlib(",currheader->require[i]->name,7) != 0) {
|
} else if (strncmp("rpmlib(",currheader->require[i]->name,7) &&
|
||||||
|
strncmp("debuginfo(build-id)",currheader->require[i]->name,20)) {
|
||||||
provided=findOrCreateProvidedListEntry((struct providedList**) &ct->providedlist_idx[archidx],
|
provided=findOrCreateProvidedListEntry((struct providedList**) &ct->providedlist_idx[archidx],
|
||||||
currheader->require[i]->name,1,archidx);
|
currheader->require[i]->name,1,archidx);
|
||||||
if (provided->numproviders == 0) {
|
if (provided->numproviders == 0) {
|
||||||
@ -714,7 +715,8 @@ resolveFirstLevelSourceDependencies(struct configTag *ct, int archidx)
|
|||||||
/* if (strncmp("a2ps",currsourceheader->name,4) == 0) {
|
/* if (strncmp("a2ps",currsourceheader->name,4) == 0) {
|
||||||
fprintf(stderr,"a2ps:%s\n",currheader->require[i]->name);
|
fprintf(stderr,"a2ps:%s\n",currheader->require[i]->name);
|
||||||
}*/
|
}*/
|
||||||
if (strncmp("rpmlib(",currsourceheader->require[i]->name,7) != 0) {
|
if (strncmp("rpmlib(",currsourceheader->require[i]->name,7) &&
|
||||||
|
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) {
|
||||||
|
@ -1794,6 +1794,7 @@ 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)) continue;
|
||||||
nonobsoletednumproviders=0;
|
nonobsoletednumproviders=0;
|
||||||
for (i = 0; i < provided->numproviders; i++) {
|
for (i = 0; i < provided->numproviders; i++) {
|
||||||
// skip duplicated provides
|
// skip duplicated provides
|
||||||
@ -1817,7 +1818,11 @@ int print_datatables(struct configTag *ct, int arch) {
|
|||||||
fprintf(fs,":");
|
fprintf(fs,":");
|
||||||
for (i = 0; i < provided->numproviders; i++) {
|
for (i = 0; i < provided->numproviders; i++) {
|
||||||
if (!provided->provider[i]->obsoleted) {
|
if (!provided->provider[i]->obsoleted) {
|
||||||
|
if (i == 0 || strcmp(provided->provider[i-1]->name,
|
||||||
|
provided->provider[i]->name))
|
||||||
fprintf(fd,"%s ",provided->provider[i]->name);
|
fprintf(fd,"%s ",provided->provider[i]->name);
|
||||||
|
if (i == 0 || strcmp(provided->provider[i-1]->sourceheader->name,
|
||||||
|
provided->provider[i]->sourceheader->name))
|
||||||
fprintf(fs," _%s",provided->provider[i]->sourceheader->name);
|
fprintf(fs," _%s",provided->provider[i]->sourceheader->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1833,6 +1838,8 @@ int print_datatables(struct configTag *ct, int arch) {
|
|||||||
fprintf(fv,"%s= # ",provided->name);
|
fprintf(fv,"%s= # ",provided->name);
|
||||||
for (i = 0; i < provided->numproviders; i++) {
|
for (i = 0; i < provided->numproviders; i++) {
|
||||||
if (!provided->provider[i]->obsoleted) {
|
if (!provided->provider[i]->obsoleted) {
|
||||||
|
if (i == 0 || strcmp(provided->provider[i-1]->name,
|
||||||
|
provided->provider[i]->name))
|
||||||
fprintf(fv,"%s ",provided->provider[i]->name);
|
fprintf(fv,"%s ",provided->provider[i]->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1896,7 +1903,8 @@ int print_datatables(struct configTag *ct, int arch) {
|
|||||||
//
|
//
|
||||||
fprintf(fbd,"%s:",currheaderlist->name);
|
fprintf(fbd,"%s:",currheaderlist->name);
|
||||||
for (i = 0; i < currheaderlist->sourceheader->requirecount; i++) {
|
for (i = 0; i < currheaderlist->sourceheader->requirecount; i++) {
|
||||||
if (strncmp("rpmlib(",currheaderlist->sourceheader->require[i]->name,7) != 0) {
|
if (strncmp("rpmlib(",currheaderlist->sourceheader->require[i]->name,7) &&
|
||||||
|
strncmp("debuginfo(build-id)",currheaderlist->sourceheader->require[i]->name,20)) {
|
||||||
fprintf(fbd," ");
|
fprintf(fbd," ");
|
||||||
fprintf_depstable_filtered_var(fbd,currheaderlist->sourceheader->require[i]->name);
|
fprintf_depstable_filtered_var(fbd,currheaderlist->sourceheader->require[i]->name);
|
||||||
}
|
}
|
||||||
@ -1966,14 +1974,10 @@ int print_datatables(struct configTag *ct, int arch) {
|
|||||||
|
|
||||||
if (currchild) {
|
if (currchild) {
|
||||||
|
|
||||||
if (!strncmp(currheadersourcelist->arch, "noarch", PATH_MAX))
|
|
||||||
snprintf(obsoletebuf, OBSOLETEBUF_SIZE, "noarch");
|
|
||||||
else
|
|
||||||
snprintf(obsoletebuf, OBSOLETEBUF_SIZE, "%s", ct->arch[arch]);
|
|
||||||
fprintf(fbsh,"[ \"$pkg\" = \"%s\" ] && { pkg_header=(%s %s %s %s \"%s\" \"%s\" %ld %ld %d %s); ",
|
fprintf(fbsh,"[ \"$pkg\" = \"%s\" ] && { pkg_header=(%s %s %s %s \"%s\" \"%s\" %ld %ld %d %s); ",
|
||||||
currheadersourcelist->name,
|
currheadersourcelist->name,
|
||||||
currheadersourcelist->name,
|
currheadersourcelist->name,
|
||||||
obsoletebuf,
|
currchild->arch,
|
||||||
currheadersourcelist->version,
|
currheadersourcelist->version,
|
||||||
currheadersourcelist->release,
|
currheadersourcelist->release,
|
||||||
currheadersourcelist->group,
|
currheadersourcelist->group,
|
||||||
|
Loading…
Reference in New Issue
Block a user