From 066d4a5bab628ef8220971bb5763ff8f3a13de07 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 18 Nov 2016 12:04:08 +0100 Subject: react to trig-pend only if we have nothing else to do MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a package is triggered dpkg frequently issues two messages about it causing us to make a note about it both times which messes up our planned dpkg actions view. Adding these actions if we have nothing else planned fixes this and should still be correct as those planned actions will deal with the triggering just fine and we avoid strange problems like a package triggered before its removed… --- apt-pkg/deb/dpkgpm.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 9d1739d68..7c41e02b4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -715,18 +715,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) if (prefix == "status") { std::vector &states = PackageOps[pkgname]; - if (action == "triggers-pending") - { - if (Debug == true) - std::clog << "(parsed from dpkg) pkg: " << pkgname - << " action: " << action << " (prefix 2 to " - << PackageOpsDone[pkgname] << " of " << states.size() << ")" << endl; - - states.insert(states.begin(), {"installed", N_("Installed %s")}); - states.insert(states.begin(), {"half-configured", N_("Configuring %s")}); - PackagesTotal += 2; - } - else if(PackageOpsDone[pkgname] < states.size()) + if(PackageOpsDone[pkgname] < states.size()) { char const * next_action = states[PackageOpsDone[pkgname]].state; if (next_action) @@ -793,6 +782,17 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) } } } + else if (action == "triggers-pending") + { + if (Debug == true) + std::clog << "(parsed from dpkg) pkg: " << pkgname + << " action: " << action << " (prefix 2 to " + << PackageOpsDone[pkgname] << " of " << states.size() << ")" << endl; + + states.insert(states.begin(), {"installed", N_("Installed %s")}); + states.insert(states.begin(), {"half-configured", N_("Configuring %s")}); + PackagesTotal += 2; + } } } /*}}}*/ -- cgit v1.2.3