52 files changed, 143 insertions, 86 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 784d1f0bf..1fea4f94a 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -193,6 +193,8 @@ bool PackageContainerInterface::FromGroup(PackageContainerInterface * const pci,
 	if (archfound != std::string::npos) {
 		arch = pkg.substr(archfound+1);
 		pkg.erase(archfound);
+		if (arch == "all" || arch == "native")
+			arch = _config->Find("APT::Architecture");
 	}
 
 	pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg);
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 593bb063b..3e6ef3520 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -102,6 +102,7 @@ bool MMap::Map(FileFd &Fd)
 	 {
 	    // for readonly, we don't need sync, so make it simple
 	    Base = malloc(iSize);
+	    SyncToFd = new FileFd();
 	    return Fd.Read(Base, iSize);
 	 }
 	 // FIXME: Writing to compressed fd's ?
@@ -216,7 +217,17 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &Work
 {
    if (_error->PendingError() == true)
       return;
-   
+
+   // disable Moveable if we don't grow
+   if (Grow == 0)
+      this->Flags &= ~Moveable;
+
+#ifndef __linux__
+   // kfreebsd doesn't have mremap, so we use the fallback
+   if ((this->Flags & Moveable) == Moveable)
+      this->Flags |= Fallback;
+#endif
+
    unsigned long long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
@@ -328,7 +339,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln
       if(!Grow())
       {
 	 _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size "
-			 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
+			 "of APT::Cache-Start. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
 	 return 0;
       }
    }
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 46fc499c6..b93bf6ab9 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -643,7 +643,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
 	    }
 
 	    // Look for something that could be configured.
-	    for (DepIterator Cur = Start; Bad == true; ++Cur)
+	    for (DepIterator Cur = Start; Bad == true && Cur.end() == false; ++Cur)
 	    {
 	       SPtrArray<Version *> VList = Cur.AllTargets();
 	       for (Version **I = VList; *I != 0; ++I)
diff --git a/configure.in b/configure.in
index e7ef002cc..2a768d3d7 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.2"
+PACKAGE_VERSION="0.9.7.3"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index a9ef6a967..035d3378a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.9.7.3) UNRELEASED; urgency=low
+apt (0.9.7.3) unstable; urgency=low
 
   [ Manpages translation updates ]
   * Spanish; (Omar Campagne). Closes: #681566
@@ -6,25 +6,36 @@ apt (0.9.7.3) UNRELEASED; urgency=low
   [ Program translation updates ]
   * Czech (Miroslav Kure). Closes: #680758
 
- -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jul 2012 09:47:02 -0600
+  [ David Kalnischkies ]
+  * apt-pkg/cacheset.cc:
+    - handle :all and :native correctly as architectures again
+      in the commandline parsing (regression in 0.9.7)
+  * apt-pkg/packagemanager.cc:
+    - do not segfault if nothing can be configured to statisfy
+      a pre-depends (e.g. in a pre-depends loop) (Closes: #681958)
+  * apt-pkg/contrib/mmap.cc:
+    - trigger the usage of the fallback code for kfreebsd also in the
+      second (filebased) constructor of DynamicMMap (Closes: #677704)
+    - refer to APT::Cache-Start in case the growing failed as if -Limit is
+      really the offender it will be noted in a previous error message.
+    - for filesystems not supporting mmap'ing a file we need to use a
+      SyncToFd dummy just as we did for compressed files in 0.9.5
 
-apt (0.9.7.2) unstable; urgency=low
+ -- Michael Vogt <mvo@debian.org>  Fri, 27 Jul 2012 17:53:41 +0200
 
+apt (0.9.7.2) unstable; urgency=low
 
   [ Manpages translation updates ]
   * French (Christian Perrier)
+  * German (Chris Leick)
 
   [ Program translation updates ]
   * Greek (Θανάσης Νάτσης)
-
   * Japanese (Kenshi Muto) (Closes: #679662)
   * Russian (Yuri Kozlov) (Closes: #679599)
   * Danish (Joe Dalton) (Closes: #680119)
   * Portuguese (Miguel Figueiredo) (Closes: #680616)
 
-  [ Manpage translation updates ]
-  * German (Chris Leick)
-
   [ David Kalnischkies ]
   * debian/apt.cron.daily:
     - do not try to backup extended_states file if it doesn't
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 0cc24a254..5184cd339 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.2">
+<!ENTITY apt-product-version "0.9.7.3">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "lenny">
diff --git a/doc/po/es.po b/doc/po/es.po
index f2d27acb2..4c3626090 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1294,7 +1294,7 @@ msgid ""
 msgstr ""
 "Las simulaciones de ejecución realizadas por un usuario desactivan el "
 "bloqueo de forma automática (<literal>Debug::NoLocking</literal>), y si se "
-"define la opción literal>APT::Get::Show-User-Simulation-Note</literal> "
+"define la opción <literal>APT::Get::Show-User-Simulation-Note</literal> "
 "(activa de forma predefinida) se muestra un aviso que indica que solo es una "
 "simulación. Las ejecuciones realizadas como usuario «root» no activan "
 "«NoLocking» o el aviso. Los administradores deben ser conscientes de sus "
@@ -2339,7 +2339,7 @@ msgid ""
 msgstr ""
 "Actualiza el registro de claves local con el registro de claves del archivo "
 "y elimina del registro local las claves de archivo que ya no son válidas. El "
-"registro de claves del archivo se encuentra en el paquete literal>archive-"
+"registro de claves del archivo se encuentra en el paquete <literal>archive-"
 "keyring</literal> de su distribución; esto es, el paquete <literal>debian-"
 "archive-keyring</literal> en Debian."
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 5c64141cf..8048c9a34 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2041,7 +2041,7 @@ msgstr ""
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 88158d0d1..2c168a4b5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2071,7 +2071,7 @@ msgstr "فشلت كتابة الملف %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 070ffb525..6432dcc26 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2280,11 +2280,11 @@ msgstr "Falló al francer el ficheru"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
-"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
+"Start. El valor actual ye : %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/bg.po b/po/bg.po
index f967cbc71..2e4851e55 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2317,11 +2317,11 @@ msgstr "Неуспех при отрязване на края на файла"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
-"Limit. Текуща стойност: %lu (man 5 apt.conf)"
+"Start. Текуща стойност: %lu (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/bs.po b/po/bs.po
index 6a4772811..a92636f49 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2068,7 +2068,7 @@ msgstr "Ne mogu ukloniti %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 283af2e4f..2581433db 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2316,11 +2316,11 @@ msgstr "No s'ha pogut truncar el fitxer %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
-"Limit. Valor actual: %lu. (man 5 apt.conf)"
+"Start. Valor actual: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index 2259e559d..60cc2d62c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2282,10 +2282,10 @@ msgstr "Nelze zmenšit soubor"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Limit. "
+"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. "
 "Současná hodnota: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/cy.po b/po/cy.po
index ec5d59a2b..ecddc2749 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2320,7 +2320,7 @@ msgstr "Methwyd ysgrifennu ffeil %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index ebfba1d73..2efc7242b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2302,10 +2302,10 @@ msgstr "Kunne ikke afkorte filen"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Limit. "
+"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. "
 "Aktuel værdi: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/de.po b/po/de.po
index cb35a3acd..860a00fe9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2364,11 +2364,11 @@ msgstr "Datei konnte nicht eingekürzt werden."
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::"
-"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+"Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/dz.po b/po/dz.po
index 6f815804c..b43fb305c 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -2273,7 +2273,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ�
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 205c43591..3e8dd8dea 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2294,7 +2294,7 @@ msgstr "Αποτυχία εγγραφής του αρχείου %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 11295cdae..dda8114b6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2361,11 +2361,11 @@ msgstr "Falló al truncar el archivo"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
-"valor de «APT::Cache-Limit». El valor actual es: %lu (man 5 apt.conf)"
+"valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index 3d3a15b46..e3d7623b8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2270,10 +2270,10 @@ msgstr "Huts fitxategia mozterakoan"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
+"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko "
 "balioa: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/fi.po b/po/fi.po
index f0f9a97c6..00f3ae327 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2268,7 +2268,7 @@ msgstr "Tiedoston typistäminen ei onnistunut"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index b20036cbe..90d5890f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2359,11 +2359,11 @@ msgstr "Échec de la troncature du fichier"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
-"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
+"Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/gl.po b/po/gl.po
index 574e44c5a..1092efb3b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2305,11 +2305,11 @@ msgstr "Non foi posíbel truncar o ficheiro"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
-"Limit. O valor actual é : %lu. (man 5 apt.conf)"
+"Start. O valor actual é : %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/he.po b/po/he.po
index e05730472..a2e3cba60 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1927,7 +1927,7 @@ msgstr ""
 #: apt-pkg/contrib/mmap.cc:234
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index f25d00c12..171ecad7b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2308,10 +2308,10 @@ msgstr "A fájl csonkítása meghiúsult"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Limit méretét. A "
+"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A "
 "jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/it.po b/po/it.po
index d616c84a9..d24f1aeb5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2336,10 +2336,10 @@ msgstr "Troncamento del file non riuscito"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
+"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il "
 "valore attuale è: %lu (man 5 apt.conf)."
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/ja.po b/po/ja.po
index ac1c0fb93..3531765ff 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2289,10 +2289,10 @@ msgstr "ファイルの切り詰めに失敗しました"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"動的 MMap が範囲を越えました。APT::Cache-Limit の大きさを増やしてください。現"
+"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現"
 "在値は %lu です (man 5 apt.conf を参照)。"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/km.po b/po/km.po
index 6c2ea5275..e9bcf9d3a 100644
--- a/po/km.po
+++ b/po/km.po
@@ -2242,7 +2242,7 @@ msgstr "បរាជ័យក្នុងការសរសេរឯក
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 04565c043..9cd4135df 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2262,10 +2262,10 @@ msgstr "파일을 자르는데 실패했습니다"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현재 "
+"동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 "
 "값: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/ku.po b/po/ku.po
index 975fd9608..de54b3d0d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -2086,7 +2086,7 @@ msgstr "Nivîsîna pelê %s biserneket"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index d3d28c856..c63c8f374 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2180,7 +2180,7 @@ msgstr "Nepavyko patikrinti %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index fe19ac652..7c6a58d2b 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -2247,7 +2247,7 @@ msgstr "फाईल छोटी करणे असफल"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 8b9d98123..3b9875ff2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2281,10 +2281,10 @@ msgstr "Klarte ikke forkorte fila %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
+"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. "
 "Nåværende verdi: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/ne.po b/po/ne.po
index 2761f0b2a..084acb48a 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -2244,7 +2244,7 @@ msgstr "फाइल %s लेख्न असफल भयो"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 114bee569..c6cf6dcee 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2308,11 +2308,11 @@ msgstr "Afkorten van bestand is mislukt"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
-"Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
+"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/nn.po b/po/nn.po
index 170c65c2b..bdc50d036 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2257,7 +2257,7 @@ msgstr "Klarte ikkje skriva fila %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 61f20d2bb..877ed20eb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2340,11 +2340,11 @@ msgstr "Nie udało się uciąć zawartości pliku %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
-"Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
+"Start. Aktualna wartość: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 93af7dbb3..4a2c1b57c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2307,11 +2307,11 @@ msgstr "Falhou truncar o ficheiro"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
-"Limit. Valor actual: %lu. (man 5 apt.conf)"
+"Start. Valor actual: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 930ec79a3..3f352079f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2289,7 +2289,7 @@ msgstr "Falhou ao truncar arquivo"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index e1556214a..584eca389 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2299,7 +2299,7 @@ msgstr "Eșec la trunchierea fișierului"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 6da85af7e..153d22624 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2338,10 +2338,10 @@ msgstr "Не удалось обрезать файл"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
+"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. "
 "Текущее значение: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/sk.po b/po/sk.po
index 803fab0d5..c913a1dbf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2300,11 +2300,11 @@ msgstr "Nepodarilo sa skrátiť súbor"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
-"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+"Start. Aktuálna hodnota: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 7bf3076be..816fc7202 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2301,11 +2301,11 @@ msgstr "Ni mogoče obrezati datoteke"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-"
-"Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)"
+"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-"
+"Start. Trenutna vrednost: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
 #, c-format
@@ -2786,7 +2786,7 @@ msgid ""
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
-"APT::Takojąnja-nastavitev za podrobnosti. (%d)"
+"APT::Immediate-Configure za podrobnosti. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
@@ -2820,7 +2820,7 @@ msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Napaka. pkgProblemResolver::Napake pri razrešitvi, ki so jih morda "
+"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
 "povzročili zadržani paketi."
 
 #: apt-pkg/algorithms.cc:1225
diff --git a/po/sv.po b/po/sv.po
index b860d1874..2919c9416 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2299,10 +2299,10 @@ msgstr "Misslyckades med att kapa av filen"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
+"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. "
 "Aktuellt värde: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/th.po b/po/th.po
index f1c75bcfa..9ca45cba1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2230,7 +2230,7 @@ msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/tl.po b/po/tl.po
index 666d3245c..7a551a643 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -2279,7 +2279,7 @@ msgstr "Bigo sa pagsulat ng talaksang %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 3ce9dbc9f..87aeafa62 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2294,7 +2294,7 @@ msgstr "Не вдалося записати файл %s"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 034c5d612..361a995fc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2308,11 +2308,11 @@ msgstr "Lỗi cắt ngắn tập tin"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Dynamic MMap (ảnh xạ bộ nhớ động) đã hết sức chứa.\n"
-"Hãy tăng kích cỡ của « APT::Cache-Limit » (giới hạn vùng nhớ tạm Apt).\n"
+"Hãy tăng kích cỡ của « APT::Cache-Start » (giới hạn vùng nhớ tạm Apt).\n"
 "Giá trị hiện thời:  %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2b1a86636..7e2865552 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2233,10 +2233,10 @@ msgstr "无法截断文件"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
+"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 573c48b1c..b6abc8cad 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2231,10 +2231,10 @@ msgstr "無法截短檔案"
 #: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
+"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。"
 "(man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:429
diff --git a/test/integration/test-cachecontainer-architecture-specification b/test/integration/test-cachecontainer-architecture-specification
index 55e464a07..47abfb5b0 100755
--- a/test/integration/test-cachecontainer-architecture-specification
+++ b/test/integration/test-cachecontainer-architecture-specification
@@ -8,6 +8,7 @@ configarchitecture 'amd64' 'armel'
 
 #insertinstalledpackage 'xserver-xorg-core' 'amd64' '2:1.7.6-2ubuntu7.10'
 insertpackage 'unstable' 'libsame' 'armel,amd64' '1' 'Multi-Arch: same'
+insertpackage 'unstable' 'foo' 'all' '1'
 
 setupaptarchive
 
@@ -88,3 +89,35 @@ Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-*
 testequal 'Reading package lists...
 Building dependency tree...
 E: Unable to locate package libsame' aptget -s install libsame:windows-any
+
+testequal 'Reading package lists...
+Building dependency tree...
+E: Unable to locate package foo' aptget -s install foo:armel
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:all
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:amd64
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:native