Re: [PATCH setup 00/13] ListView Package Chooser

[Ken Brown <kbrown@cornell.edu>]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

On 8/6/2018 10:15 AM, Ken Brown wrote:
> I have one minor fix (patch attached)

Slightly revised patch attached.


[-- Attachment #2: 0001-Ensure-that-an-installed-packageversion-has-an-ldesc.patch --]
[-- Type: text/plain, Size: 1486 bytes --]

From 7a166b04523b0d3e4547e937cad429d31ef55e90 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Mon, 6 Aug 2018 10:05:12 -0400
Subject: [PATCH] Ensure that an installed packageversion has an ldesc if
 possible

In packagedb::read(), copy the ldesc from setup.ini to the
packageversion read from installed.db.  Otherwise, an installed
package with only one version will not have an ldesc to use as a
tooltip.

v2: If the installed version is no longer available, copy the ldesc
from the current version of the package.
---
 package_db.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package_db.cc b/package_db.cc
index b74aafd..03874ec 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -149,6 +149,7 @@ packagedb::read ()
                   if (pv)
                     {
                       data.sdesc = pv.SDesc();
+                      data.ldesc = pv.LDesc();
                       data.archive = *pv.source();
                       data.stability = pv.Stability();
                       data.spkg_id = pv.sourcePackage();
@@ -172,6 +173,7 @@ packagedb::read ()
                       if (pkgm)
                         {
                           data.sdesc = pkgm->curr.SDesc();
+                          data.ldesc = pkgm->curr.LDesc();
                           if (pkgm->curr
                               && version_compare (f.ver, pkgm->curr.Canonical_version()) > 0)
                             data.stability = TRUST_TEST;
-- 
2.17.0