* 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 13be17a017096ac4fc8c4b42a70a143fd6bbef9c..6c8341b624a21f2a91025bc9ebfa1e8ea0ae651c 100644 (file)
--- 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 81afb22b69a28fcbc0dffa06a43ba9aae5987fc5..8cbf4257993ffa3a8165761d1f6498767bd3f84c 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 8ba89aed6a6333ab50bbbd42fdbaeea656d07e5c..4fe2cc4a6736870525ae0049582298fb9c7bd83a 100644 (file)
--- 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