cleanup commit for trigger processing:

- remove the DPkg::NoConfTriggers - absolutely useless as we need
  TriggersPending already so we can use --no-triggers.
- remove the Immediate-option from the example, it doesn't help much.
- UnpackCritical uses DepUnPackPre with a D (on simple letter...)
- the "smart" optimisation to skip A was not so smart - revert.

2 files changed, 6 insertions, 13 deletions

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 5edab5ac7..aec4edc49 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -631,7 +631,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
    unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);
    unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
    bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false);
-   bool const NoConfTriggers = _config->FindB("DPkg::NoConfTriggers", NoTriggers);
 
    if (RunScripts("DPkg::Pre-Invoke") == false)
       return false;
@@ -797,8 +796,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       }
 
       if (NoTriggers == true && I->Op != Item::TriggersPending &&
-	  I->Op != Item::ConfigurePending &&
-	  (I->Op != Item::Configure || NoConfTriggers == true))
+	  I->Op != Item::ConfigurePending)
       {
 	 Args[n++] = "--no-triggers";
 	 Size += strlen(Args[n-1]);
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index e5bd8247d..0ee2e2bc8 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -175,7 +175,7 @@ bool pkgOrderList::OrderCritical()
 {
    FileList = 0;
 
-   Primary = &pkgOrderList::DepUnPackPre;
+   Primary = &pkgOrderList::DepUnPackPreD;
    Secondary = 0;
    RevDepends = 0;
    Remove = 0;
@@ -238,15 +238,10 @@ bool pkgOrderList::OrderUnpack(string *FileList)
    Me = this;
    qsort(List,End - List,sizeof(*List),&OrderCompareA);
 
-   if (_config->Find("PackageManager::Configure","all") == "all")
-   {
-      if (Debug == true)
-	 clog << "** Pass A" << endl;
-      if (DoRun() == false)
-	 return false;
-   }
-   else if (Debug == true)
-      clog << "** Skip A (same as B for non-all Configure)" << endl;
+   if (Debug == true)
+      clog << "** Pass A" << endl;
+   if (DoRun() == false)
+      return false;
 
    if (Debug == true)
       clog << "** Pass B" << endl;