Author: djpig
Date: 2006-05-15 17:38:36 +0000 (Mon, 15 May 2006)
New Revision: 322
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/src/depcon.c
Log:
Try harder to detect dependency cycles that contain Provides
links. Closes: #349120, #349442
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-15 16:41:26 UTC (rev 321)
+++ trunk/ChangeLog 2006-05-15 17:38:36 UTC (rev 322)
@@ -1,3 +1,8 @@
+2006-05-15 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * src/depcon.c (findbreakcyclerecursive): Try
+ to find cycles also by moving up Provides links.
+
2006-05-15 Ian Jackson <[EMAIL PROTECTED]>
* debian/control (dpkg[Depends]): Move
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-15 16:41:26 UTC (rev 321)
+++ trunk/debian/changelog 2006-05-15 17:38:36 UTC (rev 322)
@@ -28,6 +28,8 @@
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.
Modified: trunk/src/depcon.c
===================================================================
--- trunk/src/depcon.c 2006-05-15 16:41:26 UTC (rev 321)
+++ trunk/src/depcon.c 2006-05-15 17:38:36 UTC (rev 322)
@@ -127,6 +127,7 @@
*/
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;
}
}
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
