diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-09-18 16:54:48 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-09-18 16:54:48 +0200 |
| commit | d5081aeeb0a1bf4098e3a0d8395e4c7b84f4ac9e (patch) | |
| tree | 3d743356751948586463c2296e0c596942744c7e /apt-pkg/deb/dpkgpm.cc | |
| parent | 5e312de78360736fa3ef505909ef84da211362ca (diff) | |
cleanup commit for trigger processing:
- remove the DPkg::NoConfTriggers - absolutely useless as we need
TriggersPending already so we can use --no-triggers.
- remove the Immediate-option from the example, it doesn't help much.
- UnpackCritical uses DepUnPackPre with a D (on simple letter...)
- the "smart" optimisation to skip A was not so smart - revert.
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 5edab5ac7..aec4edc49 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -631,7 +631,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false); - bool const NoConfTriggers = _config->FindB("DPkg::NoConfTriggers", NoTriggers); if (RunScripts("DPkg::Pre-Invoke") == false) return false; @@ -797,8 +796,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) } if (NoTriggers == true && I->Op != Item::TriggersPending && - I->Op != Item::ConfigurePending && - (I->Op != Item::Configure || NoConfTriggers == true)) + I->Op != Item::ConfigurePending) { Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); |