Просмотр исходного кода

* apt-pkg/deb/debsystem.cc:
- fix issues with dir::state::status and dir::state::extended_states
when alternative rootdirs are used

Michael Vogt лет назад: 15
Родитель
Сommit
ea38b1e608
2 измененных файлов с 5 добавлено и 2 удалено
  1. 2 2
      apt-pkg/deb/debsystem.cc
  2. 3 0
      debian/changelog

+ 2 - 2
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
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
       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");
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
 
    if (StatusFile) {
    if (StatusFile) {

+ 3 - 0
debian/changelog

@@ -12,6 +12,9 @@ apt (0.8.7) UNRELEASED; urgency=low
       apt-get update cron job fetches the right translated package
       apt-get update cron job fetches the right translated package
       descriptions
       descriptions
   * fix test failure on amd64
   * 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
  -- Christian Perrier <bubulle@debian.org>  Tue, 05 Oct 2010 05:35:58 +0200