* apt-pkg/pkgcache.cc:

  - always prefer "en" over "" for "en"-language regardless of cache-order

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 40b99891ae49b2f6ee64347da4354af8442cb1e0..c854249e444d437fcc2341ba6c5849d40c022047 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -894,11 +894,22 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
    {
       pkgCache::DescIterator Desc = DescriptionList();
       for (; Desc.end() == false; ++Desc)
-        if (*l == Desc.LanguageCode() ||
-            (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0))
+        if (*l == Desc.LanguageCode())
            break;
       if (Desc.end() == true)
-        continue;
+      {
+        if (*l == "en")
+        {
+           Desc = DescriptionList();
+           for (; Desc.end() == false; ++Desc)
+              if (strcmp(Desc.LanguageCode(), "") == 0)
+                 break;
+           if (Desc.end() == true)
+              continue;
+        }
+        else
+           continue;
+      }
       return Desc;
    }
    for (pkgCache::DescIterator Desc = DescriptionList();

diff --git a/debian/changelog b/debian/changelog
index 52396e84c3dd3d1062f31bb7bc853d29b227b7ec..bda786e12a2d9a1df8325d1f495572378456a47f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
       This also means that descriptions are shared across archives now.
     - add implicit dependencies needed for Multi-Arch at the time a Version
       struct is created and not at the end of the cache generation
+  * apt-pkg/pkgcache.cc:
+    - always prefer "en" over "" for "en"-language regardless of cache-order
 
   [ Michael Vogt ]
   * apt-pkg/contrib/configuration.cc:
@@ -42,7 +44,7 @@ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
   * ftparchive/cachedb.cc:
     - fix buffersize in bytes2hex
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Oct 2011 20:02:25 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Oct 2011 22:27:18 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low