Use description of installed package if it's not available anymore

* dselect/pkginfo.cc (packagelist::itd_description), dselect/pkgtop.cc
(packagelist::redraw1itemsel): Use description of installed
package as a fallback if the package is not more listed in the
available list.

Based on a patch by Bruce Sass <bmsass@shaw.ca>.

diff --git a/ChangeLog b/ChangeLog
index d969a3f1a649d9daba7f93061597e7a21009584d..adc776497d0584d5e18bed9cab388d3129874bf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-04  Raphael Hertzog  <hertzog@debian.org>
+            Bruce Sass <bmsass@shaw.ca>
+
+       * dselect/pkginfo.cc (packagelist::itd_description), dselect/pkgtop.cc
+       (packagelist::redraw1itemsel): Use description of installed
+       package as a fallback if the package is not more listed in the
+       available list.
+
 2008-07-02  Guillem Jover  <guillem@debian.org>
 
        * lib/fields.c (convert_string): Remove unneeded variable assignments.

diff --git a/THANKS b/THANKS
index 31726197fc531aa7f7974199f36233f56cdce473..9fe83024e76cff9ca6d290371a9b3b9eb6a670b0 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -21,6 +21,7 @@ Branden Robinson <branden@debian.org>
 Branko Lankester
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 Bruce Perens <bruce@pixar.com>
+Bruce Sass <bmsass@shaw.ca>
 Carl Streeter <streeter@cae.wisc.edu>
 Carlos Laviola <claviola@brfree.com.br>
 Carlos Z.F. Liu <carlosliu@users.sourceforge.net>

diff --git a/debian/changelog b/debian/changelog
index ef049829005d40329a8487bd3479102f379e471e..40bbb89838639f1a94b05d8e1dc72f4b69f4b444 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     they are not always available. Closes: #488293
   * Improve error message in install-info when the file doesn't exist.
     Thanks to Thomas Hood <jdthood@yahoo.co.uk>. Closes: #107098
+  * Use description of installed package as fallback in dselect.
+    Based on a patch from Bruce Sass <bmsass@shaw.ca>. Closes: #21659
 
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904

diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 503d22d845c5c134ef3ee19f03f348c06ee15ebb..d8eecc72d2f662510d3816ac428a17a6c6c1c9b4 100644 (file)
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -108,6 +108,8 @@ void packagelist::itd_description() {
 
   if (table[cursorline]->pkg->name) {
     const char *m= table[cursorline]->pkg->available.description;
+    if (!m || !*m)
+      m = table[cursorline]->pkg->installed.description;
     if (!m || !*m)
       m = _("No description available.");
     const char *p= strchr(m,'\n');

diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 2a7c01de35b28a532688a3e32c6db510ac6af003..3022c50b20c64880885934acb053bfa2384900e3 100644 (file)
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -221,7 +221,8 @@ void packagelist::redraw1itemsel(int index, int selected) {
     }
 
     i= description_width;
-    p= info->description ? info->description : "";
+    p= info->description ? info->description :
+       pkg->installed.description ? pkg->installed.description : "";
     while (i>0 && *p && *p != '\n') { waddnstr(listpad,p,1); i--; p++; }
       
   } else {