summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-08-25 14:24:49 +0200
committerJulian Andres Klode <jak@debian.org>2016-08-26 22:24:24 +0200
commit2ed62ba6abcad809d1898a40950f86217af73812 (patch)
tree1e8fad511855b9d15005ae88215a1c2da399c946 /apt-pkg
parent15134a8e5458fc634482386f1fd2acbccc3ac892 (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.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7238d692e..f715e060e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -3488,7 +3488,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;