diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-16 09:15:17 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-16 09:15:17 +0200 |
| commit | b36597e050beaca71a481590c3d287ac706f4309 (patch) | |
| tree | d248b4392d20335a9b41d322e1d6cef8da3e02ab | |
| parent | 44edc41ea7146be02775a3af05e91fc56faae3e9 (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 | 2 |
3 files changed, 11 insertions, 1 deletions
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 @@ -697,6 +697,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 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 |