Преглед изворни кода

* add DPkg::NoTriggers option so that applications that call
apt/aptitude (like the installer) defer trigger processing
(thanks to Joey Hess)

Michael Vogt пре 18 година
родитељ
комит
870ce08fa3
2 измењених фајлова са 6 додато и 0 уклоњено
  1. 3 0
      apt-pkg/deb/dpkgpm.cc
  2. 3 0
      debian/changelog

+ 3 - 0
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 MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);   
    unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
    unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
+   bool NoTriggers = _config->FindB("DPkg::NoTriggers",false);
 
 
    if (RunScripts("DPkg::Pre-Invoke") == false)
    if (RunScripts("DPkg::Pre-Invoke") == false)
       return false;
       return false;
@@ -689,6 +690,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 
 	 
 	 case Item::Configure:
 	 case Item::Configure:
 	 Args[n++] = "--configure";
 	 Args[n++] = "--configure";
+	 if (NoTriggers)
+	    Args[n++] = "--no-triggers";
 	 Size += strlen(Args[n-1]);
 	 Size += strlen(Args[n-1]);
 	 break;
 	 break;
 	 
 	 

+ 3 - 0
debian/changelog

@@ -21,6 +21,9 @@ apt (0.7.15) UNRELEASED; urgency=low
     (thanks to Arnaud Ebalard, closes: #485965)
     (thanks to Arnaud Ebalard, closes: #485965)
   * add doc/examples/apt-https-method-example.cof
   * add doc/examples/apt-https-method-example.cof
     (thanks to Arnaud Ebalard, closes: #485964)
     (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)
 
 
  --
  --