Make dselect do conflict resolution when dealing with automatically selected recommen...

diff --git a/ChangeLog b/ChangeLog
index 8af5ab22bd8dbbdf176d6c557eabc9238c702b42..62f850649a9a928b7e5cdc85705e6a4953c253a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 26 14:55:53 CET 2003 Wichert Akkerman <wichert@wiggy.net>
+
+  * dselect/pkgdepcon.cc: change return value for pkgdepcon() to indicate
+    a conflict resolution is needed when dealing with autoselected
+    recommends
+
 Sat Oct 25 15:46:16 CDT 2003 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Tag for 1.10.16 release date(for real this time).

diff --git a/debian/changelog b/debian/changelog
index 62084823130a7d3ba59f01d495380861a2ea4e94..a039b225fc1f1e42df17b424fb37c43c583d592d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dpkg (1.10.17) unstable; urgency=medium
+
+  * Make dselect do conflict resolution when dealing with automatically
+    selected recommended package. Thanks to Colin Watson for the analysis
+    and patch. Closes: Bug#151663
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun, 26 Oct 2003 14:58:55 +0100
+
 dpkg (1.10.16) unstable; urgency=low
 
   * Almost *EVERY* damn file was including config.h in the wrong spot.

diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 91208556573c7f718a2bdb56e69ea71004a315ec..3a0353bf50631422d614e951021fae79fee68455 100644 (file)
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -292,7 +292,7 @@ int packagelist::resolvedepcon(dependency *depends) {
       best->selected= best->suggested= pkginfo::want_install;
       best->spriority= sp_selecting;
     }
-    return r;
+    return r ? 2 : 0;
     
   mustdeselect:
     best= depends->up->clientdata;
@@ -308,7 +308,7 @@ int packagelist::resolvedepcon(dependency *depends) {
           ? pkginfo::want_purge : pkginfo::want_deinstall; /* fixme: configurable */
       best->spriority= sp_deselecting;
     }
-    return r;
+    return r ? 2 : 0;
     
   case dep_conflicts: