summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc3
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 77143e671..0071c151e 100644
--- 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 35b447dd4..1600fed98 100644
--- a/debian/changelog
+++ b/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