diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-16 09:31:27 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-16 09:31:27 +0200 |
| commit | 0a495eb83448737573e4d56e5a7dcf05d08c04ed (patch) | |
| tree | a1f179b68c9aa6555d1008e2e1784aaea62f6b0c | |
| parent | 9c026d3a0d6cf4bf8e15e456861310750c998275 (diff) | |
* apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
- fix fetching language information by adding OptionalSubIndexTarget
| -rw-r--r-- | apt-pkg/acquire-item.h | 8 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 17 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index f39a90c0b..60ec55fcb 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -687,6 +687,14 @@ class SubIndexTarget : public IndexTarget } }; /*}}}*/ +/** \brief Information about an subindex index file. */ /*{{{*/ +class OptionalSubIndexTarget : public OptionalIndexTarget +{ + virtual bool IsSubIndex() const { + return true; + } +}; + /*}}}*/ /** \brief An acquire item that downloads the detached signature {{{ * of a meta-index (Release) file, then queues up the release diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index e1f8219e3..11aa2635d 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 c6a61a683..3b7685f2a 100644 --- 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: |