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

Add provider package in pkg_needrebuild() in the form package@provider

Browse Source
This commit is contained in:
Silvan Calarco 2014-07-06 20:15:28 +02:00
parent 56baf37545
commit 7de992a3e5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/distromatic.c
View File

@ -521,12 +521,10 @@ 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]);
fprintf(stderr,"Warning: %s\n",warning);
for (j = 0; j < provided->numproviders; j++) {
addRebuild(provided->provider[j]->sourceheader,currheader->sourceheader);
addWarning(provided->provider[j]->sourceheader,warning); addWarning(provided->provider[j]->sourceheader,warning);
} }
fprintf(stderr,"Warning: %s\n",warning);
} else { } else {
/* warn about provides provided by obsoleted packages */ /* warn about provides provided by obsoleted packages */
k=0; k=0;

5
src/headerlist.c
View File

@ -93,7 +93,7 @@ struct warningList* addWarning(struct headerSourceList *pkg, char* text)
return pkg->firstwarning; return pkg->firstwarning;
} }
struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSourceList* sourceheader) struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSourceList* sourceheader, struct headerList* provider)
{ {
struct rebuildList *currrebuild, *prevrebuild = NULL; struct rebuildList *currrebuild, *prevrebuild = NULL;
@ -102,7 +102,7 @@ struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSource
currrebuild = pkg->firstrebuild; currrebuild = pkg->firstrebuild;
while (currrebuild) { while (currrebuild) {
if (currrebuild->sourceheader == sourceheader) return currrebuild; if ((currrebuild->sourceheader == sourceheader) && (currrebuild->provider == provider)) return currrebuild;
prevrebuild = currrebuild; prevrebuild = currrebuild;
currrebuild = currrebuild->next; currrebuild = currrebuild->next;
} }
@ -112,6 +112,7 @@ struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSource
if (!pkg->firstrebuild) pkg->firstrebuild=currrebuild; if (!pkg->firstrebuild) pkg->firstrebuild=currrebuild;
currrebuild->sourceheader=sourceheader; currrebuild->sourceheader=sourceheader;
currrebuild->provider=provider;
currrebuild->next=NULL; currrebuild->next=NULL;
if (prevrebuild) prevrebuild->next=currrebuild; if (prevrebuild) prevrebuild->next=currrebuild;

3
src/include/headerlist.h
View File

@ -63,6 +63,7 @@ struct warningList {
struct rebuildList { struct rebuildList {
struct headerSourceList *sourceheader; struct headerSourceList *sourceheader;
struct headerList *provider;
struct rebuildList *next; struct rebuildList *next;
}; };
@ -225,7 +226,7 @@ addToHeaderList(struct configTag *ct,
struct warningList* addWarning(struct headerSourceList *pkg,char* text); struct warningList* addWarning(struct headerSourceList *pkg,char* text);
struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSourceList* sourceheader); struct rebuildList* addRebuild(struct headerSourceList *pkg, struct headerSourceList* sourceheader, struct headerList* provider);
int getPackageNameFromFile(char *name); int getPackageNameFromFile(char *name);

2
src/reports.c
View File

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