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

distromatic.c: add versioned "fails to provide" to needrebuild list

Browse Source 
reports.c: remove other arch duplicates in pkg_need_rebuild=()
This commit is contained in:
Silvan Calarco 2022-02-19 15:05:34 +01:00
parent 3197ec8cf7
commit d95d93440f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/distromatic.c
View File

@ -526,7 +526,8 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
provided->provider[j]->name, provided->provider[j]->name,
provided->provider[j]->arch, provided->provider[j]->arch,
ct->repository[provided->provider[j]->altrepository]->tag); ct->repository[provided->provider[j]->altrepository]->tag);
addRebuild(provided->provider[j]->sourceheader,currheader->sourceheader,provided->provider[j]); addRebuild(provided->provider[j]->sourceheader,
currheader->sourceheader, provided->provider[j]);
addWarning(provided->provider[j]->sourceheader,warning); addWarning(provided->provider[j]->sourceheader,warning);
} }
fprintf(stderr,"Warning: %s\n",warning); fprintf(stderr,"Warning: %s\n",warning);
@ -664,6 +665,8 @@ resolveFirstLevelDependencies(struct configTag *ct, int archidx)
if (provided->provider[k]->sourceheader && if (provided->provider[k]->sourceheader &&
(provided->provider[k]->altrepository == ct->repository_level)) { (provided->provider[k]->altrepository == ct->repository_level)) {
addWarning(provided->provider[k]->sourceheader, warning); addWarning(provided->provider[k]->sourceheader, warning);
addRebuild(provided->provider[k]->sourceheader,
currheader->sourceheader, provided->provider[k]);
} }
if ((currheader->altrepository == ct->repository_level)) { if ((currheader->altrepository == ct->repository_level)) {
addWarning(currheader->sourceheader, warning); addWarning(currheader->sourceheader, warning);

3
src/headerlist.c
View File

@ -106,7 +106,8 @@ struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSource
currrebuild = pkg->firstrebuild; currrebuild = pkg->firstrebuild;
while (currrebuild) { while (currrebuild) {
if ((currrebuild->sourceheader == sourceheader) && (currrebuild->provider == provider)) return currrebuild; if ((currrebuild->sourceheader == sourceheader) &&
(currrebuild->provider == provider)) return currrebuild;
prevrebuild = currrebuild; prevrebuild = currrebuild;
currrebuild = currrebuild->next; currrebuild = currrebuild->next;
} }

4
src/reports.c
View File

@ -1999,7 +1999,9 @@ int print_datatables(struct configTag *ct, int arch) {
} }
fprintf(fbsh," pkg_needrebuild=("); fprintf(fbsh," pkg_needrebuild=(");
while (currrebuild) { while (currrebuild) {
fprintf(fbsh, "%s@%s ", currrebuild->sourceheader->name, currrebuild->provider->name); if (!strcmp(currrebuild->provider->arch, ct->arch[arch])) {
fprintf(fbsh, "%s@%s ", currrebuild->sourceheader->name, currrebuild->provider->name);
}
currrebuild = currrebuild->next; currrebuild = currrebuild->next;
} }
fprintf(fbsh,"); }\n"); fprintf(fbsh,"); }\n");