diff -Nru apt-0.9.9.1~ubuntu3/apt-pkg/packagemanager.cc apt-0.9.9.1~ubuntu3.1/apt-pkg/packagemanager.cc --- apt-0.9.9.1~ubuntu3/apt-pkg/packagemanager.cc 2013-07-10 17:04:41.000000000 +0200 +++ apt-0.9.9.1~ubuntu3.1/apt-pkg/packagemanager.cc 2014-04-03 12:48:46.000000000 +0200 @@ -616,6 +616,8 @@ clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")"; if (PkgLoop) clog << " (Only Perform PreUnpack Checks)"; + if (Immediate) + clog << " immediately"; clog << endl; } @@ -956,21 +958,14 @@ for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I) { PkgIterator Pkg(Cache,*I); - + if (List->IsNow(Pkg) == false) { - if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) { - if (SmartConfigure(Pkg, 0) == false && Debug) - _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str()); - // FIXME: The above warning message might need changing - } else { - if (Debug == true) - clog << "Skipping already done " << Pkg.FullName() << endl; - } + if (Debug == true) + clog << "Skipping already done " << Pkg.FullName() << endl; continue; - } - + if (List->IsMissing(Pkg) == true) { if (Debug == true) diff -Nru apt-0.9.9.1~ubuntu3/debian/changelog apt-0.9.9.1~ubuntu3.1/debian/changelog --- apt-0.9.9.1~ubuntu3/debian/changelog 2013-09-11 17:49:45.000000000 +0200 +++ apt-0.9.9.1~ubuntu3.1/debian/changelog 2014-04-03 12:50:15.000000000 +0200 @@ -1,3 +1,10 @@ +apt (0.9.9.1~ubuntu3.1) saucy-proposed; urgency=low + + * cherry pick upstream commit 0caa5a4c to fix multiarch upgrade + bug LP: #1286161 + + -- Michael Vogt Thu, 03 Apr 2014 12:49:08 +0200 + apt (0.9.9.1~ubuntu3) saucy; urgency=low * Keep linux-tools packages matching installed kernels (LP: #1205284)