Просмотр исходного кода

* apt-pkg/pkgcache.cc:
- fix LongDesc handling in LANG=C environment

David Kalnischkies лет назад: 16
Родитель
Сommit
f824d95cac
2 измененных файлов с 5 добавлено и 2 удалено
  1. 2 1
      apt-pkg/pkgcache.cc
  2. 3 1
      debian/changelog

+ 2 - 1
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;

+ 3 - 1
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