summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:58:40 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:58:40 +0000
commitd3fc006193f9a2c647651347d556b992de3a1fab (patch)
tree16145a849060d040b3d5234ea4e54a5cbf2f7dff
parent9e10ad8a863f756436fc19d3370822b3619d9c05 (diff)
Ignore build-conflicts if package is unknown (Closes: #...
Author: tausq Date: 2001-10-02 03:16:28 GMT Ignore build-conflicts if package is unknown (Closes: #88664)
-rw-r--r--cmdline/apt-get.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 592834485..e7b747e34 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.109 2001/07/01 22:59:04 jgg Exp $
+// $Id: apt-get.cc,v 1.110 2001/10/02 03:16:28 tausq Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -1877,8 +1877,15 @@ bool DoBuildDep(CommandLine &CmdL)
{
pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
if (Pkg.end() == true)
+ {
+ /* for a build-conflict; ignore unknown packages */
+ if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||
+ (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
+ continue;
+
return _error->Error(_("%s dependency on %s cannot be satisfied because the package %s cannot be found"),
Last->BuildDepType((*D).Type),Src.c_str(),(*D).Package.c_str());
+ }
pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||