Przeglądaj źródła

Try harder to detect dependency cycles that contain Provides
links. Closes: #349120, #349442

Frank Lichtenheld 20 lat temu
rodzic
commit
93051bd169
3 zmienionych plików z 8 dodań i 0 usunięć
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 0
      src/depcon.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2006-05-15  Frank Lichtenheld  <djpig@debian.org>
+
+	* src/depcon.c (findbreakcyclerecursive): Try
+	to find cycles also by moving up Provides links.
+
 2006-05-15  Ian Jackson  <iwj@ubuntu.com>
 
 	* debian/control (dpkg[Depends]): Move

+ 2 - 0
debian/changelog

@@ -28,6 +28,8 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
     on a version of textutils which provides /usr/bin/md5sum.  We rely on
     the logic in coreutils to remove our diversions. Patch by
     Ian Jackson. Closes: #315784, #313605
+  * Try harder to detect dependency cycles that contain Provides
+    links. Closes: #349120, #349442
 
   [ Nicolas François ]
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.

+ 1 - 0
src/depcon.c

@@ -127,6 +127,7 @@ static int findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *s
          */
         if (foundcyclebroken(&thislink,sofar,provider,possi)) return 1;
 	if (foundcyclebroken(&thislink,sofar,possi->ed,provider->installed.depended)) return 1;
+	if (findbreakcyclerecursive(provider,&thislink)) return 1;
       }
     }
   }