diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-29 12:14:42 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-29 12:14:42 +0200 |
| commit | 1f46d14620a0b58a9239fa3faa59ba79a98f6c98 (patch) | |
| tree | fd096e59115c48d15f27b1ae7376caf5ce2929dc /apt-pkg/deb | |
| parent | e110d7bf5675f484c06b82f621ac98bedc464865 (diff) | |
| parent | 55ef358b06854768cea247870e1d2f28a5955b90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental
Conflicts:
test/integration/test-bug-747261-arch-specific-conflicts
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 7cb8e3b68..3bdc551b4 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -526,7 +526,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const if (FileExists(TranslationFile)) { FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension); - debListParser TransParser(&Trans); + debTranslationsParser TransParser(&Trans); if (_error->PendingError() == true) return false; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 5a2282f9c..56a83b36e 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -115,4 +115,15 @@ class debDebFileParser : public debListParser pkgCache::VerIterator &Ver); }; +class debTranslationsParser : public debListParser +{ + public: + // a translation can never be a real package + virtual std::string Architecture() { return ""; } + virtual std::string Version() { return ""; } + + debTranslationsParser(FileFd *File, std::string const &Arch = "") + : debListParser(File, Arch) {}; +}; + #endif |