From 18056707d923f55c165385f08569bed00162cb7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 20 Oct 2012 15:23:21 +0200 Subject: adds a comment for Translators to the 'do as I say' prompt to prevent problems like #691024 in new translations --- cmdline/apt-get.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4e307b657..6890b7120 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1255,7 +1255,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, { if (_config->FindB("APT::Get::Trivial-Only",false) == true) return _error->Error(_("Trivial Only specified but this is not a trivial operation.")); - + + // TRANSLATOR: This string needs to be typed by the user as a confirmation, so be + // careful with hard to type or special characters (like non-breaking spaces) const char *Prompt = _("Yes, do as I say!"); ioprintf(c2out, _("You are about to do something potentially harmful.\n" -- cgit v1.2.3 From 2b8b1e7a16fa122e2b0661a8c19863a7621576cb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 24 Oct 2012 01:30:19 +0200 Subject: * apt-pkg/packagemanager.cc: - do not do lock-step configuration for a M-A:same package if it isn't unpacked yet in SmartConfigure and do not unpack a M-A:same package again in SmartUnPack if we have already configured it (LP: #1062503) --- apt-pkg/packagemanager.cc | 2 ++ debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 9ca6098fd..e2d7dbf2a 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -492,6 +492,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) P.end() == false; P = Pkg.Group().NextPkg(P)) { if (Pkg == P || List->IsFlag(P,pkgOrderList::Configured) == true || + List->IsFlag(P,pkgOrderList::UnPacked) == false || Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)) continue; @@ -877,6 +878,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c P.end() == false; P = Pkg.Group().NextPkg(P)) { if (P->CurrentVer != 0 || P == Pkg || List->IsFlag(P,pkgOrderList::UnPacked) == true || + List->IsFlag(P,pkgOrderList::Configured) == true || Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)) continue; diff --git a/debian/changelog b/debian/changelog index 9aa3e6ff3..ba6e4f49a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ apt (0.9.7.7) UNRELEASED; urgency=low * Catalan (Jordi Mallach) * Drop a confusing non-breaking space. Closes: #691024 + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not do lock-step configuration for a M-A:same package if it isn't + unpacked yet in SmartConfigure and do not unpack a M-A:same package + again in SmartUnPack if we have already configured it (LP: #1062503) + -- Jordi Mallach Thu, 18 Oct 2012 23:30:46 +0200 apt (0.9.7.6) unstable; urgency=low -- cgit v1.2.3