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

Add obsoleted flag in headerList struct and set it to fix (remove) obsoleted packages handling in deps-* lists

Browse Source
This commit is contained in:
root 2011-08-12 17:31:13 +02:00
parent 45aed8c11e
commit 01c345c579
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/distromatic.c
View File

@ -279,6 +279,7 @@ handleObsoletedPackages(struct configTag *ct, int archidx)
for (i = 0; i < prov->numproviders; i++) { for (i = 0; i < prov->numproviders; i++) {
if (obs[i] >=0) { if (obs[i] >=0) {
j--; j--;
prov->provider[i]->obsoleted=1;
prov->provider[i]=NULL; prov->provider[i]=NULL;
} }
} }

3
src/headerlist.c
View File

@ -883,8 +883,7 @@ addToHeaderList(struct configTag *ct,
logmsg(LOG_ERROR,"header in file %s is corrupted; aborting.\n",filepath); logmsg(LOG_ERROR,"header in file %s is corrupted; aborting.\n",filepath);
return 1; return 1;
} }
newheaderlist->next = NULL; memset(newheaderlist, 0, sizeof(struct headerList));
newheaderlist->nextbrother = NULL;
getPackageInfoIntoHeaderList(h, newheaderlist); getPackageInfoIntoHeaderList(h, newheaderlist);
if (!newheaderlist->sourcename) { if (!newheaderlist->sourcename) {

1
src/include/headerlist.h
View File

@ -84,6 +84,7 @@ struct headerList {
struct requireList *requirelist; struct requireList *requirelist;
struct headerList *next, *nextbrother; struct headerList *next, *nextbrother;
struct headerSourceList *sourceheader; struct headerSourceList *sourceheader;
int obsoleted;
}; };
struct headerSourceList { struct headerSourceList {

7
src/reports.c
View File

@ -1828,9 +1828,12 @@ print_datatables(struct configTag *ct, int arch) {
fprintf(fb,"ALL_BUILDS="); fprintf(fb,"ALL_BUILDS=");
currheaderlist = ct->headerlist[arch]; currheaderlist = ct->headerlist[arch];
while (currheaderlist) { while (currheaderlist) {
fprintf(fd,"%s ", currheaderlist->name); if (currheaderlist->obsoleted) printf("%s obsoleted\n", currheaderlist->name);
fprintf(fs,"%s: _%s\n", currheaderlist->name, currheaderlist->sourceheader->name); fprintf(fs,"%s: _%s\n", currheaderlist->name, currheaderlist->sourceheader->name);
fprintf(fb,"%s ",currheaderlist->name); if (!currheaderlist->obsoleted) {
fprintf(fd,"%s ", currheaderlist->name);
fprintf(fb,"%s ",currheaderlist->name);
}
currheaderlist = currheaderlist->next; currheaderlist = currheaderlist->next;
} }
fprintf(fd,"\n"); fprintf(fd,"\n");