diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-25 14:24:49 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-10-05 21:53:38 +0200 |
| commit | 2f7b50d0ca76f05c8f113088b8fc6486a5d17394 (patch) | |
| tree | dd82df41157558c58d6712ded66c24da0430115a /apt-pkg/acquire-item.cc | |
| parent | 00494fc8f913f91d9620736eb3afa4236ae71a6f (diff) | |
changelog: Respect Dir setting for local changelog getting
This fixes issues with chroots, but the goal here was to get
the test suite working on systems without dpkg.
(cherry picked from commit 2ed62ba6abcad809d1898a40950f86217af73812)
Diffstat (limited to 'apt-pkg/acquire-item.cc')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 03b80be84..fd02b6bba 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -3245,7 +3245,8 @@ std::string pkgAcqChangelog::URI(pkgCache::VerIterator const &Ver) /*{{{*/ pkgCache::PkgIterator const Pkg = Ver.ParentPkg(); if (Pkg->CurrentVer != 0 && Pkg.CurrentVer() == Ver) { - std::string const basename = std::string("/usr/share/doc/") + Pkg.Name() + "/changelog"; + std::string const root = _config->FindDir("Dir"); + std::string const basename = root + std::string("usr/share/doc/") + Pkg.Name() + "/changelog"; std::string const debianname = basename + ".Debian"; if (FileExists(debianname)) return "copy://" + debianname; |