summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2010-10-13 14:18:18 +0200
committerMichael Vogt <mvo@debian.org>2010-10-13 14:18:18 +0200
commitea38b1e608db857d4845b7bf6275b2df1fb8c9e7 (patch)
treeac8b381ad5b0ea26733600bb22d5e20aebbaa84c
parent0497fc4c09c434ea34aa4dbfe773451d9a7082d6 (diff)
parent940ff5d6b5634b57c2e622b5295f499a7807f3de (diff)
* apt-pkg/deb/debsystem.cc:
- fix issues with dir::state::status and dir::state::extended_states when alternative rootdirs are used
-rw-r--r--apt-pkg/deb/debsystem.cc4
-rw-r--r--debian/changelog3
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index ab08a8f4d..8619822df 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -164,8 +164,8 @@ bool debSystem::Initialize(Configuration &Cnf)
/* These really should be jammed into a generic 'Local Database' engine
which is yet to be determined. The functions in pkgcachegen should
be the only users of these */
- Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states"));
- Cnf.CndSet("Dir::State::status", Cnf.FindDir("Dir", "/").append("var/lib/dpkg/status"));
+ Cnf.CndSet("Dir::State::extended_states", "extended_states");
+ Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
if (StatusFile) {
diff --git a/debian/changelog b/debian/changelog
index 50e18d3cf..58e6d28bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ apt (0.8.7) UNRELEASED; urgency=low
apt-get update cron job fetches the right translated package
descriptions
* fix test failure on amd64
+ * apt-pkg/deb/debsystem.cc:
+ - fix issues with dir::state::status and dir::state::extended_states
+ when alternative rootdirs are used
-- Christian Perrier <bubulle@debian.org> Tue, 05 Oct 2010 05:35:58 +0200