From 2c120e24097b1f495658d5b06c62dfe19028b6da Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 21:11:14 +0200 Subject: Re-applied apt-cache built-in help fixes. --- cmdline/apt-cache.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 5513fcc90..4431fd4f9 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1739,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" - " dotty - Generate package graphs for GraphVis\n" + " pkgnames - List the names of all packages in the system\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" -- cgit v1.2.3-70-g09d2 From ecd414ef61a325e8596e6a541696e350cb956753 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Tue, 11 Nov 2008 21:47:04 +0200 Subject: Removed asking to file a release-critical bug against a package if there is a request to install only one package and it is not installable. --- cmdline/apt-get.cc | 2 ++ debian/changelog | 3 +++ 2 files changed, 5 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 104baba8a..5fbe21eed 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1721,6 +1721,7 @@ bool DoInstall(CommandLine &CmdL) "requested an impossible situation or if you are using the unstable\n" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming.") << endl; + /* if (Packages == 1) { c1out << endl; @@ -1729,6 +1730,7 @@ bool DoInstall(CommandLine &CmdL) "the package is simply not installable and a bug report against\n" "that package should be filed.") << endl; } + */ c1out << _("The following information may help to resolve the situation:") << endl; c1out << endl; diff --git a/debian/changelog b/debian/changelog index e04716224..4f12c563e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.19) unstable; urgency=low * cmdline/apt-cache.cc: - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) + - Removed asking to file a release-critical bug against a package if there + is a request to install only one package and it is not installable. + (Closes: #419521) -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 -- cgit v1.2.3-70-g09d2