summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:55:12 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:55:12 +0000
commit70777d4b589007eeb840d9a67934f1e648f302d7 (patch)
treebfdc422b503c5b7e3a683480b819e29777e8c92d /apt-pkg
parenta62f8bb9110edd33cebe3968ab349657a99fa00a (diff)
Fixed depends error
Author: jgg Date: 1999-11-17 01:52:01 GMT Fixed depends error
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0df6c0a75..49e964f23 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: algorithms.cc,v 1.28 1999/10/31 23:58:35 jgg Exp $
+// $Id: algorithms.cc,v 1.29 1999/11/17 01:52:01 jgg Exp $
/* ######################################################################
Algorithms - A set of misc algorithms
@@ -738,7 +738,10 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
if (InOr == true)
{
if (OldEnd == LEnd && OrOp == OrRemove)
- Cache.MarkDelete(I);
+ {
+ if ((Flags[I->ID] & Protected) != Protected)
+ Cache.MarkDelete(I);
+ }
if (OldEnd == LEnd && OrOp == OrKeep)
Cache.MarkKeep(I);
}