diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-16 18:39:11 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-16 18:39:11 +0100 |
| commit | 6f31b247bae228250899b62b9dab6b13dc4ff170 (patch) | |
| tree | 731d773414be400e4068b97eff406fd51ac3ae39 | |
| parent | 84aa13f4e620c460c98b351a6ef12027d8d6da9c (diff) | |
* apt-pkg/deb/dpkgpm.cc:
- skip --configure if all packages disappeared
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 8 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index eb9abe909..01808be24 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; diff --git a/debian/changelog b/debian/changelog index c7bb429ff..9f1944b62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.8.13.1) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - skip --configure if all packages disappeared + + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 16 Mar 2011 18:37:53 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] |