* apt-pkg/pkgcache.cc:

  - fix LongDesc handling in LANG=C environment

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index bb28a33ca5dab5f84a07b0690feb79237529c437..a66a5198d507f9bf35667660ae510a6bd0415839 100644 (file)
--- 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 3a1cc67871ae1f9f8379baf082d1253cce9d28ed..671d9844e326fd551fb65f549f32af63808799ab 100644 (file)
--- 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