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/zh_CN.po b/po/zh_CN.po
index d0ba59cc..f6a94567 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,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-04-07 18:33+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -1183,18 +1183,18 @@ msgstr ""
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "非法响应。请输入一个合法命令或者“?”请求帮助。\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 "无法打开 %s 以写入"
 
-#: 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 "将依赖关系解决状态写入文件 %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 "成功写入依赖关系解决状态！"
 
@@ -1334,52 +1334,59 @@ msgstr "要求删除 %s"
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr "要求安装 %s 的 %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 "打开：%d；关闭；%d；defer: %d; 冲突；%d"
 
-#: src/cmdline/cmdline_resolver.cc:566
+#: src/cmdline/cmdline_resolver.cc:574
 msgid "The following actions will resolve these dependencies:"
 msgstr "下列动作将解决这些依赖关系："
 
-#: src/cmdline/cmdline_resolver.cc:583
+#: src/cmdline/cmdline_resolver.cc:591
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "是否接受该解决方案？[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 "放弃解决这些依赖关系的全部努力。"
 
-#: src/cmdline/cmdline_resolver.cc:640
+#: src/cmdline/cmdline_resolver.cc:648
 msgid "The following commands are available:"
 msgstr "下列命令可选："
 
-#: src/cmdline/cmdline_resolver.cc:657
+#: src/cmdline/cmdline_resolver.cc:665
 msgid "File to write resolver state to: "
 msgstr "将依赖关系解决状态写入文件："
 
-#: src/cmdline/cmdline_resolver.cc:672
+#: src/cmdline/cmdline_resolver.cc:680
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "无效响应；请输入下列命令之一："
 
-#: 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 "在限定的时间内没能找到解决方案。加把劲再试试？[Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:714
+#: src/cmdline/cmdline_resolver.cc:722
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "非法响应；请输入“y”或者“n”。"
 
-#: src/cmdline/cmdline_resolver.cc:723
+#: src/cmdline/cmdline_resolver.cc:731
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "未能解决依赖关系！放弃..."
 
-#: src/cmdline/cmdline_resolver.cc:729
+#: src/cmdline/cmdline_resolver.cc:737
 msgid "*** No more solutions available ***"
 msgstr "*** 没有更多的解决方案了 ***"
 
-#: 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."
@@ -3649,20 +3656,20 @@ msgstr "无法给列定义转码"
 msgid "Couldn't parse column definition"
 msgstr "无法解析列定义"
 
-#: src/pkg_view.cc:497
+#: src/pkg_view.cc:513
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: 参数错误 -- 两个主要部件？ "
 
-#: 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: 参数错误 -- 静态项目的栏列表错误"
 
-#: src/pkg_view.cc:608
+#: src/pkg_view.cc:624
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: 参数错误！"
 
-#: src/pkg_view.cc:660
+#: src/pkg_view.cc:676
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: 未发现主要部件"
 
@@ -4903,25 +4910,25 @@ msgstr ""
 msgid "False"
 msgstr "关闭"
 
-#: 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 "选项"
 
-#: 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 ""