diff options
author | Wichert Akkerman <wakkerma@debian.org> | 2001-05-07 21:07:54 +0000 |
---|---|---|
committer | Wichert Akkerman <wakkerma@debian.org> | 2001-05-07 21:07:54 +0000 |
commit | 74b0a9cac3286f7e6c502604bc0399ad36e51a03 (patch) | |
tree | 58ab5a5a88993ee74a503ec875e020e6cde040f6 | |
parent | 1d0010d0b043c19b91462c0c58f6f53584aef0ff (diff) | |
download | dpkg-74b0a9cac3286f7e6c502604bc0399ad36e51a03.tar.gz |
restore previous statement to break reverse cycles
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | main/depcon.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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> * main/dump.c: break up an assertion so it is easier to figure out what diff --git a/main/depcon.c b/main/depcon.c index 8db5a3420..51bcaae91 100644 --- a/main/depcon.c +++ b/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 * 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; } } } |