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:
0f967d1
)
Revert erase relations before checking whether we already added it
author
Florian Festi
<ffesti@redhat.com>
Tue, 14 Apr 2009 08:57:46 +0000
(10:57 +0200)
committer
Florian Festi
<ffesti@redhat.com>
Tue, 14 Apr 2009 08:57:46 +0000
(10:57 +0200)
lib/depends.c
patch
|
blob
|
history
diff --git
a/lib/depends.c
b/lib/depends.c
index
71bf71e
..
326556f
100644
(file)
--- a/
lib/depends.c
+++ b/
lib/depends.c
@@
-918,13
+918,6
@@
static inline int addRelation(rpmts ts,
if (ignoreDep(ts, p, q))
return 0;
if (ignoreDep(ts, p, q))
return 0;
- /* Avoid redundant relations. */
- /* as we add all relations for p at once
- only the latest added relation
- can be from p already */
- if (p==q || rpmteTSI(q)->tsi_suc == p)
- return 0;
-
/* Erasures are reversed installs. */
if (teType == TR_REMOVED) {
rpmte r = p;
/* Erasures are reversed installs. */
if (teType == TR_REMOVED) {
rpmte r = p;
@@
-932,6
+925,13
@@
static inline int addRelation(rpmts ts,
q = r;
}
q = r;
}
+ /* Avoid redundant relations. */
+ /* as we add all relations for p at once
+ only the latest added relation
+ can be from p already */
+ if (p==q || rpmteTSI(q)->tsi_suc == p)
+ return 0;
+
/* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
rpmteTSI(p)->tsi_count++; /* bump p predecessor count */
/* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
rpmteTSI(p)->tsi_count++; /* bump p predecessor count */