diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
| commit | afaeea148553439684e6091f282bf5a4ee5c00d6 (patch) | |
| tree | 9de4549d414a78bed64a2a20f7941695c7d6c4df /apt-pkg/deb/debindexfile.cc | |
| parent | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (diff) | |
| parent | eea0f3a6197dba565c5df349ed06c0a70b49b77f (diff) | |
Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'apt-pkg/deb/debindexfile.cc')
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index eee758b7a..a0dd15cd8 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -525,7 +525,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; |