Explorar o código

restore previous statement to break reverse cycles

Wichert Akkerman %!s(int64=25) %!d(string=hai) anos
pai
achega
74b0a9cac3
Modificáronse 2 ficheiros con 6 adicións e 1 borrados
  1. 4 0
      ChangeLog
  2. 2 1
      main/depcon.c

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+Mon May  7 23:07:01 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/depcon.c: restore previous statement to break reverse cycles 
+
 Mon May  7 23:04:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 Mon May  7 23:04:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
 
   * main/dump.c: break up an assertion so it is easier to figure out what
   * main/dump.c: break up an assertion so it is easier to figure out what

+ 2 - 1
main/depcon.c

@@ -119,7 +119,8 @@ int findbreakcycle(struct pkginfo *pkg, struct cyclesofarlink *sofar) {
         /* We don't break things at `provides' links, so `possi' is
         /* We don't break things at `provides' links, so `possi' is
          * still the one we use.
          * still the one we use.
          */
          */
-        if (foundcyclebroken(&thislink,sofar,possi->ed,provider->installed.depended)) return 1;
+        if (foundcyclebroken(&thislink,sofar,provider,possi)) return 1;
+	if (foundcyclebroken(&thislink,sofar,possi->ed,provider->installed.depended)) return 1;
       }
       }
     }
     }
   }
   }