* apt-pkg/deb/debsystem.cc:

  - fix issues with dir::state::status and dir::state::extended_states
    when alternative rootdirs are used

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index ab08a8f4dafbb31c940519c375554e59ff40a684..8619822dffc5e713b34cdeeb88e46a5ca30adbe2 100644 (file)
--- 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 50e18d3cf010610997ac16e97cad62312fa0ac28..58e6d28bd2278968b68bedadfb5c29a922a279b5 100644 (file)
--- 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