folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added byHeader to dependency conflict reporting 

CVS patchset: 2011
CVS date: 1998/02/24 19:43:14
This commit is contained in:
ewt 1998-02-24 19:43:14 +00:00
parent 6e61dd8c34
commit 425d259fda
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/depends.c
View File

@ -316,6 +316,7 @@ void rpmdepFreeConflicts(struct rpmDependencyConflict * conflicts, int
int i;
for (i = 0; i < numConflicts; i++) {
headerFree(conflicts[i].byHeader);
free(conflicts[i].byName);
free(conflicts[i].byVersion);
free(conflicts[i].byRelease);
@ -635,6 +636,7 @@ static int checkPackageDeps(rpmDependencies rpmdep, struct problemsSet * psp,
psp->problems = realloc(psp->problems, sizeof(*psp->problems) *
psp->alloced);
}
psp->problems[psp->num].byHeader = headerCopy(h);
psp->problems[psp->num].byName = strdup(name);
psp->problems[psp->num].byVersion = strdup(version);
psp->problems[psp->num].byRelease = strdup(release);
@ -677,6 +679,7 @@ static int checkPackageDeps(rpmDependencies rpmdep, struct problemsSet * psp,
psp->problems = realloc(psp->problems, sizeof(*psp->problems) *
psp->alloced);
}
psp->problems[psp->num].byHeader = headerCopy(h);
psp->problems[psp->num].byName = strdup(name);
psp->problems[psp->num].byVersion = strdup(version);
psp->problems[psp->num].byRelease = strdup(release);

1
lib/rpmlib.h
View File

@ -302,6 +302,7 @@ typedef struct rpmDependencyCheck * rpmDependencies;
struct rpmDependencyConflict {
char * byName, * byVersion, * byRelease;
Header byHeader;
/* these needs fields are misnamed -- they are used for the package
which isn't needed as well */
char * needsName, * needsVersion;