Просмотр исходного кода

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.

Arch Librarian лет назад: 22
Родитель
Сommit
0296c633c4
3 измененных файлов с 7 добавлено и 2 удалено
  1. 5 1
      apt-pkg/algorithms.cc
  2. 1 1
      buildlib/makefile.in
  3. 1 0
      debian/changelog

+ 5 - 1
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;
 		  }
 		  

+ 1 - 1
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

+ 1 - 0
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