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

Only check the type of dependency requested in checkInstDeps() 

- This gets called separately for requires, conflicts and obsoletes,
  wth should it loop over conflicts when looking for requires?
This commit is contained in:
Panu Matilainen 2010-04-15 10:24:03 +03:00
parent a0ed26b894
commit da6e66a9b2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/depends.c
View File

@ -487,17 +487,11 @@ static void checkInstDeps(rpmts ts, depCache dcache, rpmte te,
while ((h = rpmdbNextIterator(mi)) != NULL) {
char * pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
rpmds requires = rpmdsNew(h, RPMTAG_REQUIRENAME, 0);
rpmds conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, 0);
rpmds obsoletes = rpmdsNew(h, RPMTAG_OBSOLETENAME, 0);
rpmds ds = rpmdsNew(h, depTag, 0);
checkDS(ts, dcache, te, pkgNEVRA, requires, dep, 0);
checkDS(ts, dcache, te, pkgNEVRA, conflicts, dep, 0);
checkDS(ts, dcache, te, pkgNEVRA, obsoletes, dep, 0);
checkDS(ts, dcache, te, pkgNEVRA, ds, dep, 0);
conflicts = rpmdsFree(conflicts);
requires = rpmdsFree(requires);
obsoletes = rpmdsFree(requires);
ds = rpmdsFree(ds);
pkgNEVRA = _free(pkgNEVRA);
}
rpmdbFreeIterator(mi);