summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-02-02 22:19:36 +0100
committerJulian Andres Klode <jak@debian.org>2016-02-02 22:19:36 +0100
commit4f649ab9c5ec882b434477552e20f46826fc388f (patch)
tree3df5dbdf9ecec3b5251e52f3084a0913ff8399fb
parent37613934677e7d8a553274d666a4fe88195fde15 (diff)
parentadb4f2c5cf0e313e8d39a562fe7f095d2029f647 (diff)
Merge github.com:adrian17/apt
-rw-r--r--apt-private/private-output.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index b8e6dec02..458d78dc4 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -290,7 +290,8 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/
output = SubstVar(output, "${color:highlight}", _config->Find("APT::Color::Highlight", ""));
output = SubstVar(output, "${color:neutral}", _config->Find("APT::Color::Neutral", ""));
output = SubstVar(output, "${Description}", GetShortDescription(CacheFile, records, P));
- output = SubstVar(output, "${LongDescription}", GetLongDescription(CacheFile, records, P));
+ if (output.find("${LongDescription}") != string::npos)
+ output = SubstVar(output, "${LongDescription}", GetLongDescription(CacheFile, records, P));
output = SubstVar(output, "${ }${ }", "${ }");
output = SubstVar(output, "${ }\n", "\n");
output = SubstVar(output, "${ }", " ");