* add DPkg::NoTriggers option so that applications that call

  apt/aptitude (like the installer) defer trigger processing
  (thanks to Joey Hess)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 3528c16196098dc4c5a4a3c810669e5ca508c720..c2c33f342a359b638d82499557aacfc3a7c6038f 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -554,6 +554,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 {
    unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);   
    unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
+   bool NoTriggers = _config->FindB("DPkg::NoTriggers",false);
 
    if (RunScripts("DPkg::Pre-Invoke") == false)
       return false;
@@ -689,6 +690,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         
         case Item::Configure:
         Args[n++] = "--configure";
+        if (NoTriggers)
+           Args[n++] = "--no-triggers";
         Size += strlen(Args[n-1]);
         break;
         

diff --git a/debian/changelog b/debian/changelog
index b921fb004fb7fb08eb0f177ef47adf6bb399afe8..f040d6cdfdd5dbf7a5973052ce11388026e04278 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ apt (0.7.15) UNRELEASED; urgency=low
     (thanks to Arnaud Ebalard, closes: #485965)
   * add doc/examples/apt-https-method-example.cof
     (thanks to Arnaud Ebalard, closes: #485964)
+  * add DPkg::NoTriggers option so that applications that call
+    apt/aptitude (like the installer) defer trigger processing
+    (thanks to Joey Hess)
 
  --