Просмотр исходного кода

* main/depcon.c, debian/changelog: When walking the list of providers of
a dependency, the arguments were passed in reverse to the cyclebreak
checker, so cycles involving provides were never detected.
* debian/changelog: Document that we fixed a segfault.

Adam Heath лет назад: 25
Родитель
Сommit
3d2f0b420e
3 измененных файлов с 14 добавлено и 1 удалено
  1. 7 0
      ChangeLog
  2. 6 0
      debian/changelog
  3. 1 1
      main/depcon.c

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+Mon Apr 23 15:36:58 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * main/depcon.c, debian/changelog: When walking the list of providers of
+    a dependency, the arguments were passed in reverse to the cyclebreak
+    checker, so cycles involving provides were never detected.
+  * debian/changelog: Document that we fixed a segfault.
+
 Mon Apr 23 14:13:48 CDT 2001 Adam Heath <doogie@debian.org>
 
   * main/help.c: Fix bad memory access do_script(), introduced when the

+ 6 - 0
debian/changelog

@@ -14,6 +14,12 @@ dpkg (1.9.0) unstable; urgency=low
     use about the same amount of memory, and largemem is faster.  Both
     --largemem and --smallmem are now obselete options, and will print
     a warning if used. Closes: Bug#84905
+  * Initialize unitialized variables.  This should solve several
+    segfaults. Closes: Bug#25317(plus 8 others, thru the beauty of
+    merges)
+  * Found that when working with dependency cycles, and part of the cycle
+    was a provide, the provider was not being considered, so the cycle
+    could not be broken. Closes: Bug#87985(and 3 others)
   * Update German translation, Closes: Bug#80529,#80532,#87581
   * Update French translation, Closes: Bug#65284,#85035,#87238
   * Update Japanese translation, Closes: Bug#93873

+ 1 - 1
main/depcon.c

@@ -118,7 +118,7 @@ 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,provider,possi)) return 1;
+        if (foundcyclebroken(&thislink,sofar,possi->ed,provider->installed.depended)) return 1;
       }
     }
   }