Remove is not sticky

Author: jgg
Date: 1999-10-27 04:38:27 GMT
Remove is not sticky

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 1603377..d68fbfb 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: algorithms.h,v 1.7 1999/07/09 04:11:34 jgg Exp $
+// $Id: algorithms.h,v 1.8 1999/10/27 04:38:27 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -91,7 +91,8 @@ class pkgProblemResolver
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
    inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
-
+   inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
+   
    // Try to intelligently resolve problems by installing and removing packages   
    bool Resolve(bool BrokenFix = false);
    

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d7727c7..2448f57 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.84 1999/10/24 06:03:48 jgg Exp $
+// $Id: apt-get.cc,v 1.85 1999/10/27 04:38:28 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -829,7 +829,8 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       _error->Error("Package %s has no installation candidate",Pkg.Name());
       return false;
    }
-   
+
+   Fix.Clear(Pkg);
    Fix.Protect(Pkg);
    if (Remove == true)
    {

diff --git a/debian/changelog b/debian/changelog
index 2a2cf4e..9dcff3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ apt (0.3.13.1) unstable; urgency=low
   * Dependency reports now show OR group relations
   * Re-Install feature. Cloes: #46961, #37393, #38919
   * Locks archive directory on clean (woops)
+  * Remove is not 'sticky'. Closes: #48392
   
  -- Jason Gunthorpe <jgg@debian.org>  Fri,  3 Sep 1999 09:04:28 -0700