summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-08-06 14:00:02 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-08-06 14:00:02 +0200
commitcbf217843cc8eaaebd6d798854d92aab961efd9d (patch)
treecdec428db26249b5fb395bdf315dabd87384250a /apt-pkg/deb
parentff38d63b19c0be1fb4be9a692fed2702d935d5e5 (diff)
parent5aa95c863d9bc5b0de7dd1279d3ad672193cc3a6 (diff)
* merge patch that enforces stricter https server certificate
checking (thanks to Arnaud Ebalard, closes: #485960) * allow per-mirror specific https settings (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) * document --install-recommends and --no-install-recommends (thanks to Dereck Wonnacott, LP: #126180) * apt-ftparchive might write corrupt Release files (LP: #46439) * Apply --important option to apt-cache depends (LP: #16947)
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index ede1673bc..a3f32e3c5 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -556,6 +556,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;
@@ -606,7 +607,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
PackageProcessingOps.insert( make_pair("install",N_("Installing %s")) );
PackageProcessingOps.insert( make_pair("configure",N_("Configuring %s")) );
PackageProcessingOps.insert( make_pair("remove",N_("Removing %s")) );
- PackageProcessingOps.insert( make_pair("trigproc",N_("Triggering %s")) );
+ PackageProcessingOps.insert( make_pair("trigproc",N_("Running post-installation trigger %s")) );
// init the PackageOps map, go over the list of packages that
// that will be [installed|configured|removed|purged] and add
@@ -691,6 +692,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
case Item::Configure:
Args[n++] = "--configure";
+ if (NoTriggers)
+ Args[n++] = "--no-triggers";
Size += strlen(Args[n-1]);
break;