diff options
| -rw-r--r-- | apt-pkg/packagemanager.cc | 3 | ||||
| -rwxr-xr-x | test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 55880d1b5..a1b3f4537 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -609,7 +609,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); - if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same && + not List->IsFlag(Pkg, pkgOrderList::Immediate)) for (PkgIterator P = Pkg.Group().PackageList(); P.end() == false; P = Pkg.Group().NextPkg(P)) { diff --git a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first index 5a3e2762e..beb7c0854 100755 --- a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first +++ b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first @@ -26,9 +26,9 @@ The following packages will be upgraded: Inst libsame:i386 [1] (2 unstable [i386]) [apt:i386 ] Inst libsame (2 unstable [amd64]) [apt:i386 ] Conf libsame:i386 (2 unstable [i386]) [apt:i386 ] -Conf libsame (2 unstable [amd64]) [apt:i386 ] Inst apt:i386 [1] (2 unstable [i386]) -Conf apt:i386 (2 unstable [i386])' 'Reading package lists... +Conf apt:i386 (2 unstable [i386]) +Conf libsame (2 unstable [amd64])' 'Reading package lists... Building dependency tree... The following additional packages will be installed: apt:i386 libsame:i386 |