소스 검색

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

Michael Vogt 15 년 전
부모
커밋
b36597e050
3개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 0
      apt-pkg/acquire-item.h
  2. 1 1
      apt-pkg/deb/debmetaindex.cc
  3. 2 0
      debian/changelog

+ 8 - 0
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;

+ 1 - 1
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);

+ 2 - 0
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