diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:01 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:01 +0000 |
| commit | 61d6a8de486f2262acbb47cea24f5dae143be8d1 (patch) | |
| tree | 936596f587018e12603cdb4ac1c5a2e517752b29 | |
| parent | 67a51bcc96e3e09528ce0b5841f93f511ed1e44f (diff) | |
Remove is not sticky
Author: jgg
Date: 1999-10-27 04:38:27 GMT
Remove is not sticky
| -rw-r--r-- | apt-pkg/algorithms.h | 5 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 1603377f4..d68fbfbea 100644 --- 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 d7727c7d3..2448f5707 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.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 2a2cf4ebf..9dcff3b23 100644 --- 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 |