From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 16 Sep 2011 07:15:17 +0000 (+0200)
Subject: * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
X-Git-Tag: 0.9.0~51^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b36597e050beaca71a481590c3d287ac706f4309

* apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
  - fix fetching language information by adding OptionalSubIndexTarget
---

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 13be17a01..6c8341b62 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -691,6 +691,14 @@ class OptionalIndexTarget : public IndexTarget
 									/*}}}*/
 /** \brief Information about an subindex index file. */			/*{{{*/
 class SubIndexTarget : public IndexTarget
+{
+   virtual bool IsSubIndex() const {
+      return true;
+   }
+};
+									/*}}}*/
+/** \brief Information about an subindex index file. */			/*{{{*/
+class OptionalSubIndexTarget : public OptionalIndexTarget
 {
    virtual bool IsSubIndex() const {
       return true;
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 81afb22b6..8cbf42579 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -221,7 +221,7 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 	} else {
 		for (std::set<std::string>::const_iterator s = sections.begin();
 		     s != sections.end(); ++s) {
-			IndexTarget * Target = new OptionalIndexTarget();
+			IndexTarget * Target = new OptionalSubIndexTarget();
 			Target->ShortDesc = "TranslationIndex";
 			Target->MetaKey = TranslationIndexURISuffix("Index", *s);
 			Target->URI = TranslationIndexURI("Index", *s);
diff --git a/debian/changelog b/debian/changelog
index 8ba89aed6..4fe2cc4a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ apt (0.8.16~exp5) experimental; urgency=low
   * apt-pkg/contrib/configuration.cc:
     - fix double delete (LP: #848907)
     - ignore only the invalid regexp instead of all options
+  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+    - fix fetching language information by adding OptionalSubIndexTarget
 
  -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200