apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that

we resolve virtual package Breaks more effectively.  Thanks to Colin
Watson for the patch.  Closes: #657695, LP: #922485.

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index f7a333606e572332d46ec73bb454d846b713de56..7a9586ca015a966cf927df54ca52beb0c8e0edca 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1098,8 +1098,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
                  LEnd->Dep = End;
                  LEnd++;
                  
                  LEnd->Dep = End;
                  LEnd++;
                  

-                 if (Start->Type != pkgCache::Dep::Conflicts &&
-                     Start->Type != pkgCache::Dep::Obsoletes)
+                 if (Start.IsNegative() == false)

                     break;
               }
            }
                     break;
               }
            }

diff --git a/debian/changelog b/debian/changelog
index 1220528886f6919058df2d0f678c897be85884c2..9bd5453e25ad6935a3b95663bcb63e444beef652 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-apt (0.8.16~exp12ubuntu1~ppa1) precise; urgency=low
+apt (0.8.16~exp12ubuntu1) UNRELEASED; urgency=low

 
 

+  [ Michael Vogt ]

   * merge from debian/experimental:
     - new ABI
 
   * merge from debian/experimental:
     - new ABI
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Jan 2012 20:07:38 +0100
+  [ Steve Langasek ]
+  * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
+    we resolve virtual package Breaks more effectively.  Thanks to Colin
+    Watson for the patch.  Closes: #657695, LP: #922485.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 28 Jan 2012 11:40:53 -0800

 
 apt (0.8.16~exp12) experimental; urgency=low
 
 
 apt (0.8.16~exp12) experimental; urgency=low