1 --- ./lib/rpmlib.h.org Sun Jun 17 13:38:45 2001
2 +++ ./lib/rpmlib.h Sun Jun 17 13:37:38 2001
5 const char * byVersion;
6 const char * byRelease;
9 /* these needs fields are misnamed -- they are used for the package
10 which isn't needed as well */
11 --- ./lib/depends.c.org Sun Jun 17 13:38:59 2001
12 +++ ./lib/depends.c Sun Jun 17 13:36:56 2001
16 static int checkPackageDeps(rpmTransactionSet ts, struct problemsSet * psp,
17 - Header h, const char * keyName, uint_32 multiLib)
18 + Header h, const char * keyName, uint_32 multiLib, void *key)
20 const char * name, * version, * release;
21 const char ** requires;
23 psp->problems[psp->num].byName = xstrdup(name);
24 psp->problems[psp->num].byVersion = xstrdup(version);
25 psp->problems[psp->num].byRelease = xstrdup(release);
26 + psp->problems[psp->num].byKey = key;
27 psp->problems[psp->num].needsName = xstrdup(requires[i]);
28 psp->problems[psp->num].needsVersion = xstrdup(requiresEVR[i]);
29 psp->problems[psp->num].needsFlags = requireFlags[i];
32 rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1);
33 while ((h = rpmdbNextIterator(mi)) != NULL) {
34 - if (checkPackageDeps(ts, psp, h, key, 0)) {
35 + if (checkPackageDeps(ts, psp, h, key, 0,NULL)) {
40 for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++)
43 - rc = checkPackageDeps(ts, &ps, p->h, NULL, p->multiLib);
44 + rc = checkPackageDeps(ts, &ps, p->h, NULL, p->multiLib,p->key);