diff options
| -rw-r--r-- | apt-pkg/algorithms.cc | 6 | ||||
| -rw-r--r-- | buildlib/makefile.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index e784ce895..0df6c0a75 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.27 1999/10/22 05:58:54 jgg Exp $ +// $Id: algorithms.cc,v 1.28 1999/10/31 23:58:35 jgg Exp $ /* ###################################################################### Algorithms - A set of misc algorithms @@ -799,7 +799,11 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if ((Flags[I->ID] & Protected) == Protected) { if (DoUpgrade(Pkg) == true) + { Scores[Pkg->ID] = Scores[I->ID]; + break; + } + continue; } diff --git a/buildlib/makefile.in b/buildlib/makefile.in index 9fd9bd59b..dbcc91cd6 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -37,7 +37,7 @@ else @echo > /dev/null endif ifeq ($(HAVE_C9X),yes) - -@rm include/inttypes.h + -@rm include/inttypes.h > /dev/null 2>&1 else @cp $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h endif diff --git a/debian/changelog b/debian/changelog index e49b40172..59a49ac84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ apt (0.3.13.1) unstable; urgency=low * Increased the cache size. Closes: #47648 * Comment woopsie. Closes: #48789 * Removes existing links when linking sources. Closes: #48775 + * Problem resolver does not install all virtual packages. Closes: #48591 -- Jason Gunthorpe <jgg@debian.org> Fri, 3 Sep 1999 09:04:28 -0700 |