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/pt.po b/po/pt.po
index e8b05bcd..d7175ef4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\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-09-12 22:03+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1225,18 +1225,18 @@ msgstr ""
 "Resposta inválida.  Por favor introduza um comando válido ou '?' para "
 "ajuda.\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 "Não foi possível abrir %s para escrita"
 
-#: 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 "Erro ao escrever o estado do resolver para %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 "Estado do resolver escrito com sucesso!"
 
@@ -1383,52 +1383,59 @@ msgstr "Necessita da remoção de %s"
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr "Necessita da instalação de %s versão %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 "aberto: %d; fechado: %d; adiado: %d; conflito: %d"
 
-#: src/cmdline/cmdline_resolver.cc:566
+#: src/cmdline/cmdline_resolver.cc:574
 msgid "The following actions will resolve these dependencies:"
 msgstr "As seguintes acções irão resolver estas dependências:"
 
-#: src/cmdline/cmdline_resolver.cc:583
+#: src/cmdline/cmdline_resolver.cc:591
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Aceitar esta solução? [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 "Abandonar todos os esforços para resolver estas dependências."
 
-#: src/cmdline/cmdline_resolver.cc:640
+#: src/cmdline/cmdline_resolver.cc:648
 msgid "The following commands are available:"
 msgstr "Estão disponíveis os seguintes comandos:"
 
-#: src/cmdline/cmdline_resolver.cc:657
+#: src/cmdline/cmdline_resolver.cc:665
 msgid "File to write resolver state to: "
 msgstr "Ficheiro para onde escrever o estado: "
 
-#: src/cmdline/cmdline_resolver.cc:672
+#: src/cmdline/cmdline_resolver.cc:680
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Resposta inválida; por favor introduza um dos seguintes comandos:"
 
-#: 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 "Sem solução encontrada dentro do tempo alocado.  Tentar melhor? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:714
+#: src/cmdline/cmdline_resolver.cc:722
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Resposta inválida; por favor introduza 'y' ou 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:723
+#: src/cmdline/cmdline_resolver.cc:731
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Não foi possível resolver dependências!  A desistir..."
 
-#: src/cmdline/cmdline_resolver.cc:729
+#: src/cmdline/cmdline_resolver.cc:737
 msgid "*** No more solutions available ***"
 msgstr "*** Sem mais soluções disponíveis ***"
 
-#: 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."
@@ -3799,22 +3806,22 @@ msgstr "Não pude interpretar a definição de coluna"
 msgid "Couldn't parse column definition"
 msgstr "Não foi possível processar a definição de coluna"
 
-#: src/pkg_view.cc:497
+#: src/pkg_view.cc:513
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: erro nos argumentos -- dois widgets principais??"
 
-#: 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: erro nos argumentos -- lista de colunas inválida para "
 "itens estáticos"
 
-#: src/pkg_view.cc:608
+#: src/pkg_view.cc:624
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argumento inválido!"
 
-#: src/pkg_view.cc:660
+#: src/pkg_view.cc:676
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nenhum widget principal encontrado"
 
@@ -5127,25 +5134,25 @@ msgstr ""
 msgid "False"
 msgstr "Fechar"
 
-#: 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 "Opções"
 
-#: 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 ""