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

* apt-pkg/deb/debmetaindex.cc:
- do not download TranslationIndex if no Translation-* will be
downloaded later on anyway (Closes: #624218)

David Kalnischkies лет назад: 15
Родитель
Сommit
05bb1e5dc8
2 измененных файлов с 8 добавлено и 2 удалено
  1. 4 1
      apt-pkg/deb/debmetaindex.cc
  2. 4 1
      debian/changelog

+ 4 - 1
apt-pkg/deb/debmetaindex.cc

@@ -195,11 +195,14 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 		}
 	}
 
+	std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
+	if (lang.empty() == true)
+		return IndexTargets;
+
 	// get the Translations:
 	// - if its a dists-style repository get the i18n/Index first
 	// - if its flat try to acquire files by guessing
 	if (Dist[Dist.size() - 1] == '/') {
-		std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
 		for (std::set<std::string>::const_iterator s = sections.begin();
 		     s != sections.end(); ++s) {
 			for (std::vector<std::string>::const_iterator l = lang.begin();

+ 4 - 1
debian/changelog

@@ -34,8 +34,11 @@ apt (0.8.14.2) UNRELEASED; urgency=low
   * doc/po/de.po:
     - undo the translation of the command 'dump' in manpage of apt-config
       as report by Burghard Grossmann on debian-l10n-german, thanks!
+  * apt-pkg/deb/debmetaindex.cc:
+    - do not download TranslationIndex if no Translation-* will be
+      downloaded later on anyway (Closes: #624218)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 26 Apr 2011 17:35:24 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 26 Apr 2011 19:12:41 +0200
 
 apt (0.8.14.1) unstable; urgency=low