From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18170 invoked by alias); 5 Aug 2018 22:12:08 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 18067 invoked by uid 89); 5 Aug 2018 22:12:08 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=commandline X-HELO: rgout01.bt.lon5.cpcloud.co.uk Received: from rgout01.bt.lon5.cpcloud.co.uk (HELO rgout01.bt.lon5.cpcloud.co.uk) (65.20.0.178) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 05 Aug 2018 22:12:06 +0000 X-OWM-Source-IP: 86.151.121.200 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-SNCR-VADESECURE: CLEAN Received: from localhost.localdomain (86.151.121.200) by rgout01.bt.lon5.cpcloud.co.uk (9.0.019.26-1) (authenticated as jonturney@btinternet.com) id 5B321EA003A96840; Sun, 5 Aug 2018 23:12:06 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 12/13] Restore packagemeta::LDesc() Date: Sun, 05 Aug 2018 22:12:00 -0000 Message-Id: <20180805220851.270212-13-jon.turney@dronecode.org.uk> In-Reply-To: <20180805220851.270212-1-jon.turney@dronecode.org.uk> References: <20180805220851.270212-1-jon.turney@dronecode.org.uk> X-SW-Source: 2018-08/txt/msg00019.txt.bz2 --- package_meta.cc | 15 +++++++++++++++ package_meta.h | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package_meta.cc b/package_meta.cc index 4f7d39a..85aaaf9 100644 --- a/package_meta.cc +++ b/package_meta.cc @@ -404,6 +404,21 @@ packagemeta::SDesc () const return std::string(); } +static bool +hasLDesc(packageversion const &pkg) +{ + return pkg.LDesc().size(); +} + +const std::string +packagemeta::LDesc () const +{ + set::iterator i = find_if (versions.begin(), versions.end(), hasLDesc); + if (i == versions.end()) + return std::string(); + return i->LDesc (); +}; + /* Return an appropriate caption given the current action. */ std::string packagemeta::action_caption () const diff --git a/package_meta.h b/package_meta.h index 8a42319..0eff8d0 100644 --- a/package_meta.h +++ b/package_meta.h @@ -108,9 +108,10 @@ public: bool isManuallyWanted() const; /* true if package was deleted on command-line. */ bool isManuallyDeleted() const; - /* SDesc is global in theory, across all package versions. - LDesc is not: it can be different per version */ + const std::string SDesc () const; + const std::string LDesc () const; + /* what categories does this package belong in. Note that if multiple versions * of a package disagree.... the first one read in will take precedence. */ -- 2.17.0