Fixed depends error

Author: jgg
Date: 1999-11-17 01:52:01 GMT
Fixed depends error

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0df6c0a..49e964f 100644 (file)
--- 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);
               }

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0dd396a..11b2d96 100644 (file)
--- 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.88 1999/11/16 03:16:34 jgg Exp $
+// $Id: apt-get.cc,v 1.89 1999/11/17 01:52:01 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -842,7 +842,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    }
 
    Fix.Clear(Pkg);
-   Fix.Protect(Pkg);
+   Fix.Protect(Pkg);   
    if (Remove == true)
    {
       Fix.Remove(Pkg);

diff --git a/debian/changelog b/debian/changelog
index 5c5b17c..bb951e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ apt (0.3.14.1) unstable; urgency=low
   * Fixed cast error in byteswap macro and supporting code. Closes: #50093
   * Fixed buffer overflow for wide terminal sizes. Closes: #50295
   * Made -s and clean not do anything. Closes: #50238
+  * Problem with Protected packages and the new OR code.
   
  -- Ben Gertzfield <che@debian.org>  Sun,  7 Nov 1999 20:21:25 -0800