Problem resolver does not install all virtual packages.

Author: jgg
Date: 1999-10-31 23:58:35 GMT
Problem resolver does not install all virtual packages.

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index e784ce895babf6a1c2fee8bc29b49e98ac13153a..0df6c0a75375ab03b816eb07012aafb6f4776ddd 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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
 /* ######################################################################
 
    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)
                  if ((Flags[I->ID] & Protected) == Protected)
                  {
                     if (DoUpgrade(Pkg) == true)

+                    {

                        Scores[Pkg->ID] = Scores[I->ID];
                        Scores[Pkg->ID] = Scores[I->ID];

+                       break;
+                    }
+                    

                     continue;
                  }
                  
                     continue;
                  }
                  

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 9fd9bd59b8d1434edec1dcfdb90cb573dcfaee7b..dbcc91cd696d0c8f71e71f141b78fdcfe21988e7 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -37,7 +37,7 @@ else
        @echo > /dev/null
 endif  
 ifeq ($(HAVE_C9X),yes)
        @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
 else
        @cp $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h
 endif

diff --git a/debian/changelog b/debian/changelog
index e49b40172c89c9d01dfd4424dd6d8d1b860c432a..59a49ac84b6b0637a4522eb72cbbddf7b6242964 100644 (file)
--- 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
   * 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
  
   
  -- Jason Gunthorpe <jgg@debian.org>  Fri,  3 Sep 1999 09:04:28 -0700