Ordering fix (don't use RPMSENSE_PREREQ) from Pascal Rigaux
authorPanu Matilainen <pmatilai@redhat.com>
Wed, 19 Dec 2007 07:12:59 +0000 (09:12 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Wed, 19 Dec 2007 07:12:59 +0000 (09:12 +0200)
lib/depends.c

index a1d20fa..254138a 100644 (file)
@@ -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);