summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/debsystem.cc2
-rw-r--r--apt-pkg/depcache.cc4
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt-mark.8.xml7
-rw-r--r--doc/apt.ent8
-rw-r--r--doc/examples/configure-index3
6 files changed, 15 insertions, 11 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 59f826d96..31c26ab2f 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -158,7 +158,7 @@ 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::userstatus","status.user"); // Defunct
+ Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states"));
Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 411ae5f62..bdb89b5ce 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -165,7 +165,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/
{
FileFd state_file;
- string const state = _config->FindDir("Dir::State") + "extended_states";
+ string const state = _config->FindFile("Dir::State::extended_states");
if(FileExists(state)) {
state_file.Open(state, FileFd::ReadOnly);
int const file_size = state_file.Size();
@@ -222,7 +222,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/
std::clog << "pkgDepCache::writeStateFile()" << std::endl;
FileFd StateFile;
- string const state = _config->FindDir("Dir::State") + "extended_states";
+ string const state = _config->FindFile("Dir::State::extended_states");
// if it does not exist, create a empty one
if(!FileExists(state))
diff --git a/debian/changelog b/debian/changelog
index 9fa04058d..028452751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
* apt-pkg/deb/dpkgpm.cc:
- write Disappeared also to the history.log
- forward manual-installed bit on package disappearance
+ * apt-pkg/deb/debsystem.cc:
+ - add better config item for extended_states file
-- David Kalnischkies <kalnischkies@gmail.com> Thu, 27 May 2010 17:34:51 +0200
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 3f6cc78f5..8e07cd7d9 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -121,12 +121,7 @@
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>
- <listitem><para>Status list of auto-installed packages.
- Configuration Item: <literal>Dir::State</literal>
- sets the path to the <filename>extended_states</filename> file.
- </para></listitem>
- </varlistentry>
+ &file-extended_states;
</variablelist>
</refsect1>
diff --git a/doc/apt.ent b/doc/apt.ent
index 494c6b02c..0d037c8bb 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -363,6 +363,14 @@
</varlistentry>
">
+<!ENTITY file-extended_states "
+ <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>
+ <listitem><para>Status list of auto-installed packages.
+ Configuration Item: <literal>Dir::State::extended_states</literal>.
+ </para></listitem>
+ </varlistentry>
+">
+
<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable
to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->
<!ENTITY translation-title "TRANSLATION">
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index d168417d8..487c09acb 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -294,9 +294,8 @@ Dir "/"
State "var/lib/apt/"
{
Lists "lists/";
- xstatus "xstatus";
- userstatus "status.user";
status "/var/lib/dpkg/status";
+ extended_states "extended_states";
cdroms "cdroms.list";
};