summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-12-19 09:12:59 +0200
committerPanu Matilainen <pmatilai@redhat.com>2007-12-19 09:12:59 +0200
commit4d2151d160c34e7bfca0bae0f44c5eab21e6d401 (patch)
tree3f617a273692764e6616469dab06de3a36bc7ef8
parent20bfd34975b7c4af9cce95167a227e9f9fe58316 (diff)
downloadlibrpm-tizen-4d2151d160c34e7bfca0bae0f44c5eab21e6d401.tar.gz
librpm-tizen-4d2151d160c34e7bfca0bae0f44c5eab21e6d401.tar.bz2
librpm-tizen-4d2151d160c34e7bfca0bae0f44c5eab21e6d401.zip
Ordering fix (don't use RPMSENSE_PREREQ) from Pascal Rigaux
-rw-r--r--lib/depends.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/depends.c b/lib/depends.c
index a1d20fa5f..254138a05 100644
--- 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);