diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
commit | a70b91850530b48f5a15bee95d80a3941cf6e85c (patch) | |
tree | c6c581d26883e5bed0209a080b9f9d8cab92f256 /apt-pkg/deb/dpkgpm.cc | |
parent | 6f09926a8f20f1833ab16572a78f251930bdd293 (diff) | |
parent | 00870bf52186b5adb9819c707b411ac2fffe482b (diff) |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
-rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 240574d2a..e957ce5fd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1002,6 +1002,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) else { string const nativeArch = _config->Find("APT::Architecture"); + unsigned long const oldSize = I->Op == Item::Configure ? Size : 0; for (;I != J && Size < MaxArgBytes; I++) { if((*I).Pkg.end() == true) @@ -1016,8 +1017,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) Args[n++] = Packages[pkgcount++]; } Size += strlen(Args[n-1]); - } - } + } + // skip configure action if all sheduled packages disappeared + if (oldSize == Size) + continue; + } Args[n] = 0; J = I; |