If the user has set StepLimit to 0, always abort with a message indicating that the resolver is disabled instead of going into an infinite loop. (Closes: #451311)

1 files changed, 32 insertions, 25 deletions

diff --git a/po/es.po b/po/es.po
index 2dd243df..467ea018 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.3-1\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2007-11-17 09:09-0800\n"
+"POT-Creation-Date: 2007-11-21 17:15-0800\n"
 "PO-Revision-Date: 2007-07-26 15:12+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1242,18 +1242,18 @@ msgstr ""
 "Respuesta inválida. Por favor, introduzca una orden válida o «?» para leer "
 "la ayuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660
+#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668
 #: src/generic/apt/apt.cc:202
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "No se pudo abrir %s para escribir en él"
 
-#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Error al escribir el estado del solucionador a %s"
 
-#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667
+#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675
 msgid "Resolver state successfully written!"
 msgstr "El estado del solucionador se escribió correctamente!"
 
@@ -1401,55 +1401,62 @@ msgstr "Se necesita la eliminación de %s"
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr "Se necesita la instalación de %s versión %s (%s)"
 
-#: src/cmdline/cmdline_resolver.cc:516
+#: src/cmdline/cmdline_resolver.cc:484
+#, c-format
+msgid ""
+"Would resolve dependencies, but dependency resolution is disabled.\n"
+"   (%s::ProblemResolver::StepLimit = 0)\n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:524
 #, c-format
 msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgstr "abierto: %d; cerrado: %d; diferido: %d; conflicto: %d"
 
-#: src/cmdline/cmdline_resolver.cc:566
+#: src/cmdline/cmdline_resolver.cc:574
 msgid "The following actions will resolve these dependencies:"
 msgstr "Las acciones siguientes resolverán estas dependencias"
 
-#: src/cmdline/cmdline_resolver.cc:583
+#: src/cmdline/cmdline_resolver.cc:591
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "¿Acepta esta solución? [Y/n/q/?]"
 
-#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711
+#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Abandonando todos los esfuerzos por resolver estas dependencias"
 
-#: src/cmdline/cmdline_resolver.cc:640
+#: src/cmdline/cmdline_resolver.cc:648
 msgid "The following commands are available:"
 msgstr "Las siguientes órdenes están disponibles:"
 
-#: src/cmdline/cmdline_resolver.cc:657
+#: src/cmdline/cmdline_resolver.cc:665
 msgid "File to write resolver state to: "
 msgstr "Fichero en el que escribir el estado del solucionador:"
 
-#: src/cmdline/cmdline_resolver.cc:672
+#: src/cmdline/cmdline_resolver.cc:680
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Respuesta inválida. Por favor, introduzca una de las órdenes siguientes:"
 
-#: src/cmdline/cmdline_resolver.cc:685
+#: src/cmdline/cmdline_resolver.cc:693
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "No se encontró ninguna solución en el tiempo asignado. ¿Intentarlo "
 "conzienzudamente? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:714
+#: src/cmdline/cmdline_resolver.cc:722
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Respuesta inválida. Por favor, introduzca «y» o «n»."
 
-#: src/cmdline/cmdline_resolver.cc:723
+#: src/cmdline/cmdline_resolver.cc:731
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "¡Incapaz de resolver las dependencias! Desistiendo..."
 
-#: src/cmdline/cmdline_resolver.cc:729
+#: src/cmdline/cmdline_resolver.cc:737
 msgid "*** No more solutions available ***"
 msgstr "*** No hay más soluciones disponibles ***"
 
-#: src/cmdline/cmdline_resolver.cc:739
+#: src/cmdline/cmdline_resolver.cc:751
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
@@ -3819,23 +3826,23 @@ msgstr "No se pudo cambiar la codificación de la definición de la columna"
 msgid "Couldn't parse column definition"
 msgstr "No se pudo interpretar la definición de la columna"
 
-#: src/pkg_view.cc:497
+#: src/pkg_view.cc:513
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view: error en los argumentos  -- ¿dos componentes principales?"
 
-#: src/pkg_view.cc:503
+#: src/pkg_view.cc:519
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: error en los argumentos -- la lista de columnas para el "
 "elemento estático es incorrecta."
 
-#: src/pkg_view.cc:608
+#: src/pkg_view.cc:624
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: ¡argumento incorrecto!"
 
-#: src/pkg_view.cc:660
+#: src/pkg_view.cc:676
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: componente principal no encontrado"
 
@@ -5149,25 +5156,25 @@ msgstr ""
 msgid "False"
 msgstr "Cerrar"
 
-#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391
+#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392
 #, fuzzy
 msgid "%BOption:%b  "
 msgstr "Opciones"
 
-#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393
+#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394
 msgid "%BDefault:%b "
 msgstr ""
 
-#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395
+#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396
 msgid "%BValue:%b   "
 msgstr ""
 
-#: src/apt_config_treeitems.cc:277
+#: src/apt_config_treeitems.cc:278
 #, c-format
 msgid "Editing \"%ls\""
 msgstr ""
 
-#: src/apt_config_treeitems.cc:399
+#: src/apt_config_treeitems.cc:400
 msgid "%BChoice:%b  "
 msgstr ""