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

Avoid changing the dependency sets when looking up from rpmal 

- Use indexed access and comparison to avoid mucking around with
  eg transaction element dependency sets while the callers are walking
  over them.
This commit is contained in:
Panu Matilainen 2012-10-05 10:16:44 +03:00
parent f4bb2487d4
commit 7612b1684a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rpmal.c
View File

@ -357,7 +357,7 @@ static rpmte * rpmalAllFileSatisfiesDepend(const rpmal al, const char *fileName)
rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds)
{
rpmte * ret = NULL;
int i, found;
int i, ix, found;
rpmsid nameId;
const char *name;
availableIndexEntry result;
@ -397,15 +397,13 @@ rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds)
alp = al->list + result[i].pkgNum;
if (alp->p == NULL) // deleted
continue;
(void) rpmdsSetIx(alp->provides, result[i].entryIx);
ix = result[i].entryIx;
/* Obsoletes are on package name, filter out other provide matches */
if (obsolete && !rstreq(rpmdsN(alp->provides), rpmteN(alp->p)))
if (obsolete && !rstreq(rpmdsNIndex(alp->provides, ix), rpmteN(alp->p)))
continue;
rc = 0;
if (rpmdsIx(alp->provides) >= 0)
rc = rpmdsCompare(alp->provides, ds);
rc = rpmdsCompareIndex(alp->provides, ix, ds, rpmdsIx(ds));
if (rc) {
rpmdsNotify(ds, "(added provide)", 0);