diff options
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 18 | ||||
| -rw-r--r-- | doc/dpkg-tech.dbk | 28 |
2 files changed, 11 insertions, 35 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 8311b5d7d..4eef66c2b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -338,13 +338,9 @@ unsigned short debListParser::VersionHash() /* Status lines are of the form, Status: want flag status want = unknown, install, hold, deinstall, purge - flag = ok, reinstreq, hold, hold-reinstreq - status = not-installed, unpacked, half-configured, - half-installed, config-files, post-inst-failed, - removal-failed, installed - - Some of the above are obsolete (I think?) flag = hold-* and - status = post-inst-failed, removal-failed at least. + flag = ok, reinstreq + status = not-installed, config-files, half-installed, unpacked, + half-configured, triggers-awaited, triggers-pending, installed */ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver) @@ -401,15 +397,13 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, // Process the flag field WordList StatusList[] = {{"not-installed",pkgCache::State::NotInstalled}, + {"config-files",pkgCache::State::ConfigFiles}, + {"half-installed",pkgCache::State::HalfInstalled}, {"unpacked",pkgCache::State::UnPacked}, {"half-configured",pkgCache::State::HalfConfigured}, - {"installed",pkgCache::State::Installed}, - {"half-installed",pkgCache::State::HalfInstalled}, - {"config-files",pkgCache::State::ConfigFiles}, {"triggers-awaited",pkgCache::State::TriggersAwaited}, {"triggers-pending",pkgCache::State::TriggersPending}, - {"post-inst-failed",pkgCache::State::HalfConfigured}, - {"removal-failed",pkgCache::State::HalfInstalled}, + {"installed",pkgCache::State::Installed}, {NULL, 0}}; if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false) return _error->Error("Malformed 3rd word in the Status line"); diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk index 660ccabc9..2584cf640 100644 --- a/doc/dpkg-tech.dbk +++ b/doc/dpkg-tech.dbk @@ -222,13 +222,11 @@ Where <replaceable>Want</replaceable> may be one of <emphasis>unknown</emphasis>, <emphasis>install</emphasis>, <emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>, <emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may -be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>, -<emphasis>hold</emphasis>, -<emphasis>hold-reinstreq</emphasis>. <replaceable>Status</replaceable> may -be one of <emphasis>not-installed</emphasis>, <emphasis>unpacked</emphasis>, -<emphasis>half-configured</emphasis>, <emphasis>installed</emphasis>, -<emphasis>half-installed</emphasis> <emphasis>config-files</emphasis>, -<emphasis>post-inst-failed</emphasis>, <emphasis>removal-failed</emphasis>. +be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>. +<replaceable>Status</replaceable> may +be one of <emphasis>not-installed</emphasis>, <emphasis>config-files</emphasis>, +<emphasis>half-installed</emphasis>, <emphasis>unpacked</emphasis>, +<emphasis>half-configured</emphasis> and <emphasis>installed</emphasis>. The states are as follows:- </para> <variablelist> @@ -287,22 +285,6 @@ nothing else. </para> </listitem> </varlistentry> -<varlistentry> -<term>post-inst-failed</term> -<listitem> -<para> -Old name for half-configured. Do not use. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term>removal-failed</term> -<listitem> -<para> -Old name for half-installed. Do not use. -</para> -</listitem> -</varlistentry> </variablelist> <para> The two last items are only left in dpkg for compatibility - they are |