summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-08-13 16:48:32 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-08-13 16:48:32 +0200
commitc25cd050046bd0f0d420938c1bb845f29bf12186 (patch)
tree29300c90151088fecf86b1707086fa7b8d632f69
parent4c2f0104d89569e7315b1c1570157c9d2c43161a (diff)
parentf824d95cacb53fc24a775a6a13feb2f8c7ae2ace (diff)
* apt-pkg/pkgcache.cc:
- fix LongDesc handling in LANG=C environment
-rw-r--r--apt-pkg/pkgcache.cc3
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index bb28a33ca..a66a5198d 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -894,7 +894,8 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
pkgCache::DescIterator Desc = DescDefault;
for (; Desc.end() == false; Desc++)
- if (*l == Desc.LanguageCode())
+ if (*l == Desc.LanguageCode() ||
+ (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0))
break;
if (Desc.end() == true)
Desc = DescDefault;
diff --git a/debian/changelog b/debian/changelog
index 3a1cc6787..671d9844e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,8 +35,10 @@ apt (0.8.0~pre1) UNRELASED; urgency=low
- let APT::Get::Arch-Only in build-dep default to false again
(Closes: #592628) Thanks Mohamed Amine IL Idrissi for report!
- purge packages in 'rc' state, thanks Rogier! (Closes: #150831)
+ * apt-pkg/pkgcache.cc:
+ - fix LongDesc handling in LANG=C environment
- -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Aug 2010 14:24:27 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Aug 2010 16:40:57 +0200
apt (0.7.26~exp12) experimental; urgency=low