summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-10-01 15:49:40 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-10-01 15:49:40 +0200
commit7e64cedd4da57b08ddb4ee8c22c452f98c17ce0b (patch)
tree7cd48917fb8dc1cfca7b3cdba3886ae5a7695d88
parentebd21427926418a01739baca2ee3426c103ff83a (diff)
cherry pick -r2025 from lp:~donkult/apt/sid
-rw-r--r--cmdline/apt-cache.cc4
-rw-r--r--debian/changelog3
2 files changed, 5 insertions, 2 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index ba4ad1943..79654f477 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1321,7 +1321,7 @@ bool Search(CommandLine &CmdL)
continue;
pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
if (V.end() == false)
- DFList[G->ID].Df = V.DescriptionList().FileList();
+ DFList[G->ID].Df = V.TranslatedDescription().FileList();
if (DFList[G->ID].NameMatch == false)
continue;
@@ -1334,7 +1334,7 @@ bool Search(CommandLine &CmdL)
continue;
unsigned long id = Prv.OwnerPkg().Group()->ID;
- DFList[id].Df = V.DescriptionList().FileList();
+ DFList[id].Df = V.TranslatedDescription().FileList();
DFList[id].NameMatch = true;
}
}
diff --git a/debian/changelog b/debian/changelog
index 88ccb292f..204ff818d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ apt (0.8.3ubuntu6) maverick; urgency=low
* apt-pkg/depcache.cc:
- do not check endpointer packages instead of only those which prevented
NeverAutoRemove settings from having an effect (Closes: #598452)
+ * cmdline/apt-cache.cc:
+ - use the TranslatedDescription for searching and not the first
+ available one as it is maybe not an expected language (Closes: #597925)
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Oct 2010 15:25:00 +0200