From 4b625b95a04a9d73c6682a3f9354112a394bb674 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 26 Oct 2010 23:24:41 +0200
Subject: * apt-pkg/pkgcache.cc:   - fallback always to a suitable description
 (Closes: #601016)

---
 apt-pkg/pkgcache.cc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'apt-pkg/pkgcache.cc')

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 324445fa7..616d400a2 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -891,18 +891,19 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
    for (std::vector<string>::const_iterator l = lang.begin();
 	l != lang.end(); l++)
    {
-      pkgCache::DescIterator DescDefault = DescriptionList();
-      pkgCache::DescIterator Desc = DescDefault;
-
-      for (; Desc.end() == false; Desc++)
+      pkgCache::DescIterator Desc = DescriptionList();
+      for (; Desc.end() == false; ++Desc)
 	 if (*l == Desc.LanguageCode() ||
 	     (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0))
 	    break;
-      if (Desc.end() == true) 
-	 Desc = DescDefault;
+      if (Desc.end() == true)
+	 continue;
       return Desc;
    }
-
+   for (pkgCache::DescIterator Desc = DescriptionList();
+	Desc.end() == false; ++Desc)
+      if (strcmp(Desc.LanguageCode(), "") == 0)
+	 return Desc;
    return DescriptionList();
 };
 
-- 
cgit v1.2.3-70-g09d2