* 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 f39a90c0bfd7857d5ca0657b613d40441ec70740..60ec55fcb8b42831fc1a5903c889634e744edf8d 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -681,6 +681,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 e1f8219e361b314c066084d18e80ec87558cfa8f..11aa2635dab587dc675442504cd6767a3544b451 100644 (file)
--- 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 c6a61a683a8d318de0eaa80221daf9a74ca51d0a..3b7685f2a23533902555e8facab393459536d962 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.16~exp5ubuntu9) UNRELEASEDoneiric; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+    - fix fetching language information by adding OptionalSubIndexTarget
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 16 Sep 2011 09:16:32 +0200
+
 apt (0.8.16~exp5ubuntu8) oneiric; urgency=low
 
   * cherry pick r1825 from lp:~mvo/apt/mvo: