This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 12/13] Restore packagemeta::LDesc()
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Sun, 5 Aug 2018 23:08:50 +0100
- Subject: [PATCH setup 12/13] Restore packagemeta::LDesc()
- References: <20180805220851.270212-1-jon.turney@dronecode.org.uk>
---
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<packageversion>::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