projects
/
platform
/
upstream
/
rpm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a08c83
)
Differentiate between conflicts in db versus install set
author
Panu Matilainen
<pmatilai@redhat.com>
Thu, 18 Mar 2010 10:23:38 +0000
(12:23 +0200)
committer
Panu Matilainen
<pmatilai@redhat.com>
Fri, 11 Jun 2010 07:11:43 +0000
(10:11 +0300)
- this appears to have been broken since its introduction in 2002,
commit
d89ce5854d39a9e896759fb96e6e303c67573bb6
...
- backported from commit
a609aa7dbcf4738f3b47a63d3062dcadf58ef2fa
lib/depends.c
patch
|
blob
|
history
diff --git
a/lib/depends.c
b/lib/depends.c
index
ef55adb
..
506e798
100644
(file)
--- 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;