summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:59:02 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:59:02 +0000
commit1006601e63c83586ae7786b648cfeb3c8feb72c2 (patch)
tree044d563edfe5199bbc765bfae6808a56309ef8e7 /apt-pkg/packagemanager.cc
parentd6a14f4d68dedc0ae60e8889a3719011e066d784 (diff)
Improved message for pre-depends/depend loops
Author: jgg Date: 2002-04-02 06:01:49 GMT Improved message for pre-depends/depend loops
Diffstat (limited to 'apt-pkg/packagemanager.cc')
-rw-r--r--apt-pkg/packagemanager.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index fc5f475a1..b0ebcdb59 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: packagemanager.cc,v 1.28 2001/05/27 05:36:04 jgg Exp $
+// $Id: packagemanager.cc,v 1.29 2002/04/02 06:01:49 jgg Exp $
/* ######################################################################
Package Manager - Abstacts the package manager
@@ -483,13 +483,16 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
Bad = !SmartConfigure(Pkg);
}
-
+
/* If this or element did not match then continue on to the
- next or element until a matching element is found*/
+ next or element until a matching element is found */
if (Bad == true)
- {
+ {
+ // This triggers if someone make a pre-depends/depend loop.
if (Start == End)
- return _error->Error("Internal Error, Couldn't configure a pre-depend");
+ return _error->Error("Couldn't configure pre-depend %s for %s, "
+ "probably a dependency cycle.",
+ End.TargetPkg().Name(),Pkg.Name());
Start++;
}
else