diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-18 12:23:38 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-06-11 10:11:43 +0300 |
| commit | 4d93fc4b3259c276524ce22ace9bc3385db6eb81 (patch) | |
| tree | 9347974f2d532891dd75eb0e7a22efde12d7389e | |
| parent | 0a08c8330e59bd3c0f65b7add021f303a3004f72 (diff) | |
| download | rpm-4d93fc4b3259c276524ce22ace9bc3385db6eb81.tar.gz | |
Differentiate between conflicts in db versus install set
- this appears to have been broken since its introduction in 2002,
commit d89ce5854d39a9e896759fb96e6e303c67573bb6...
- backported from commit a609aa7dbcf4738f3b47a63d3062dcadf58ef2fa
| -rw-r--r-- | lib/depends.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/depends.c b/lib/depends.c index ef55adb4e..506e79838 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -617,7 +617,7 @@ static int checkDependentConflicts(rpmts ts, depCache dcache, const char * dep) if (rpmtsGetRdb(ts) != NULL) { /* XXX is this necessary? */ rpmdbMatchIterator mi; mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, dep, 0); - rc = checkPackageSet(ts, dcache, dep, mi, 1); + rc = checkPackageSet(ts, dcache, dep, mi, 0); } return rc; |