Просмотр исходного кода

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

Michael Vogt лет назад: 18
Родитель
Сommit
e2c7992948
2 измененных файлов с 7 добавлено и 2 удалено
  1. 3 0
      apt-pkg/deb/dpkgpm.cc
  2. 4 2
      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 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;
 	 

+ 4 - 2
debian/changelog

@@ -19,9 +19,11 @@ apt (0.7.15) UNRELEASED; urgency=low
     - when checking for new important deps, skip critical ones
       (closes: #485943)
   * improve apt progress reporting, display trigger actions
+  * add DPkg::NoTriggers option so that applications that call
+    apt/aptitude (like the installer) defer trigger processing
+    (thanks to Joey Hess)
   
-  
- -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jun 2008 07:39:06 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 20:31:05 +0200
 
 apt (0.7.14) unstable; urgency=low