summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/dpkgpm.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-09-24 18:54:50 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-09-24 18:54:50 +0200
commitb69e1424886f4fe3b5b00c05889117e3eb6333e3 (patch)
tree0a83d12626b66c17ef0f9298cd4bdb937881b477 /apt-pkg/deb/dpkgpm.cc
parent3b5a76ae9ae425db6fda4ccc041fbb1e79fffc18 (diff)
parentb98f40fadef0ee5419e2315d82110869135e410f (diff)
merged from david
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
-rw-r--r--apt-pkg/deb/dpkgpm.cc19
1 files changed, 17 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index f017d53e7..adaf362fa 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -641,6 +641,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// support subpressing of triggers processing for special
// cases like d-i that runs the triggers handling manually
bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all");
+ bool const TriggersPending = _config->FindB("DPkg::TriggersPending", false);
if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true)
List.push_back(Item(Item::ConfigurePending, PkgIterator()));
@@ -701,9 +702,23 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// this loop is runs once per operation
for (vector<Item>::const_iterator I = List.begin(); I != List.end();)
{
+ // Do all actions with the same Op in one run
vector<Item>::const_iterator J = I;
- for (; J != List.end() && J->Op == I->Op; J++)
- /* nothing */;
+ if (TriggersPending == true)
+ for (; J != List.end(); J++)
+ {
+ if (J->Op == I->Op)
+ continue;
+ if (J->Op != Item::TriggersPending)
+ break;
+ vector<Item>::const_iterator T = J + 1;
+ if (T != List.end() && T->Op == I->Op)
+ continue;
+ break;
+ }
+ else
+ for (; J != List.end() && J->Op == I->Op; J++)
+ /* nothing */;
// Generate the argument list
const char *Args[MaxArgs + 50];