summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:04:26 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:04:26 +0000
commitc33d7c4d6b007137ba6cf71cba87dd4bf5547e0e (patch)
treecde9ed9c7c8d53d7e5f0b5f063f1e1eda637a714
parent8b33e866e76b7e41a3b884d596a8cc3f462e064a (diff)
* Don't suggest apt-get -f install to correct broken bu...
Author: mdz Date: 2003-12-24 22:53:10 GMT * Don't suggest apt-get -f install to correct broken build-deps; broken installed packages are rarely the cause (Closes: #220858)
-rw-r--r--cmdline/apt-get.cc5
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 4 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 604f14aa6..05d70a7fe 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.149 2003/12/20 23:58:55 mdz Exp $
+// $Id: apt-get.cc,v 1.150 2003/12/24 22:53:10 mdz Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -2222,8 +2222,7 @@ bool DoBuildDep(CommandLine &CmdL)
// Now we check the state of the packages,
if (Cache->BrokenCount() != 0)
- return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
- "You might want to run `apt-get -f install' to correct these."),*I);
+ return _error->Error(_("Build-dependencies for %s could not be satisfied."),*I);
}
if (InstallPackages(Cache, false, true) == false)
diff --git a/debian/changelog b/debian/changelog
index cf3494e3b..1181a7bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ apt (0.5.16) unstable; urgency=low
(Closes: #222560)
* Update config.guess and config.sub from autotools-dev 20031007.1
* Add knetbsd to buildlib/ostable (Closes: #212344)
+ * Don't suggest apt-get -f install to correct broken build-deps; broken
+ installed packages are rarely the cause (Closes: #220858)
- -- Matt Zimmerman <mdz@debian.org> Wed, 24 Dec 2003 14:48:28 -0800
+ --
apt (0.5.15) unstable; urgency=low