From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 26 Apr 2011 17:15:29 +0000 (+0200)
Subject: * apt-pkg/deb/debmetaindex.cc:
X-Git-Tag: 0.8.15~14^2~15
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/05bb1e5dc88497b5e4b5ba684ace99c42d1881f9?ds=inline

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

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index a6edab6b9..a91cc34e9 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/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();
diff --git a/debian/changelog b/debian/changelog
index 64cba02cd..115b4e0b6 100644
--- a/debian/changelog
+++ b/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