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

* apt-pkg/algorithms.cc:
- if a package is garbage, don't try to save it with FixByInstall

David Kalnischkies лет назад: 15
Родитель
Сommit
87da74517a
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      apt-pkg/algorithms.cc
  2. 3 1
      debian/changelog

+ 1 - 1
apt-pkg/algorithms.cc

@@ -1035,7 +1035,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
 		     if (BrokenFix == false || DoUpgrade(I) == false)
 		     {
 			// Consider other options
-			if (InOr == false)
+			if (InOr == false || Cache[I].Garbage == true)
 			{
 			   if (Debug == true)
 			      clog << "  Removing " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl;

+ 3 - 1
debian/changelog

@@ -11,8 +11,10 @@ apt (0.8.16~exp7) experimental; urgency=low
   * cmdline/apt-get.cc:
     - follow Provides in the evaluation of saving candidates, too, for
       statisfying garbage package dependencies (Closes: #640590)
+  * apt-pkg/algorithms.cc:
+    - if a package is garbage, don't try to save it with FixByInstall
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 20 Sep 2011 13:25:31 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 20 Sep 2011 14:19:38 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low