From 25140c0e4511e68ad0ffa9980734ab3042417b15 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sun, 26 Oct 2003 14:02:05 +0000 Subject: [PATCH] Make dselect do conflict resolution when dealing with automatically selected recommended packages --- ChangeLog | 6 ++++++ debian/changelog | 8 ++++++++ dselect/pkgdepcon.cc | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8af5ab22..62f85064 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 26 14:55:53 CET 2003 Wichert Akkerman + + * 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 * debian/changelog: Tag for 1.10.16 release date(for real this time). diff --git a/debian/changelog b/debian/changelog index 62084823..a039b225 100644 --- 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 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 91208556..3a0353bf 100644 --- 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: -- 2.39.5