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:
20bfd34
)
Ordering fix (don't use RPMSENSE_PREREQ) from Pascal Rigaux
author
Panu Matilainen
<pmatilai@redhat.com>
Wed, 19 Dec 2007 07:12:59 +0000
(09:12 +0200)
committer
Panu Matilainen
<pmatilai@redhat.com>
Wed, 19 Dec 2007 07:12:59 +0000
(09:12 +0200)
lib/depends.c
patch
|
blob
|
history
diff --git
a/lib/depends.c
b/lib/depends.c
index
a1d20fa
..
254138a
100644
(file)
--- a/
lib/depends.c
+++ b/
lib/depends.c
@@
-871,7
+871,7
@@
zapRelation(rpmte q, rpmte p,
/*
* Attempt to unravel a dependency loop by eliminating Requires's.
*/
- if (zap && !(
Flags & RPMSENSE_PREREQ
)) {
+ if (zap && !(
isErasePreReq(Flags) || isInstallPreReq(Flags)
)) {
rpmlog(msglvl,
_("removing %s \"%s\" from tsort relations.\n"),
(rpmteNEVRA(p) ? rpmteNEVRA(p) : "???"), dp);