From 966640d8fd2feac29909a22415955b3ce5779dcd Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 28 Jul 2010 21:53:17 +0200
Subject: * apt-pkg/orderlist.cc:   - try to install another or-group member in
 DepRemove before     breaking the or group (Closes: #590438)

---
 apt-pkg/orderlist.cc | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

(limited to 'apt-pkg/orderlist.cc')

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 55f9cb9cc..cb55147c3 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -886,13 +886,16 @@ bool pkgOrderList::DepRemove(DepIterator D)
 	    continue;
 
 	 /* We wish to see if the dep on the parent package is okay
-	    in the removed (install) state of the target pkg. */	 
+	    in the removed (install) state of the target pkg. */
+	 bool tryFixDeps = false;
 	 if (CheckDep(D) == true)
 	 {
 	    // We want to catch loops with the code below.
 	    if (IsFlag(D.ParentPkg(),AddPending) == false)
 	       continue;
 	 }
+	 else
+	    tryFixDeps = true;
 
 	 // This is the loop detection
 	 if (IsFlag(D.ParentPkg(),Added) == true || 
@@ -903,6 +906,78 @@ bool pkgOrderList::DepRemove(DepIterator D)
 	    continue;
 	 }
 
+	 if (tryFixDeps == true)
+	 {
+	    for (pkgCache::DepIterator F = D.ParentPkg().CurrentVer().DependsList();
+		 F.end() == false; ++F)
+	    {
+	       if (F->Type != pkgCache::Dep::Depends && F->Type != pkgCache::Dep::PreDepends)
+		  continue;
+	       // Check the Providers
+	       if (F.TargetPkg()->ProvidesList != 0)
+	       {
+		  pkgCache::PrvIterator Prov = F.TargetPkg().ProvidesList();
+		  for (; Prov.end() == false; ++Prov)
+		  {
+		     pkgCache::PkgIterator const P = Prov.OwnerPkg();
+		     if (IsFlag(P, InList) == true &&
+			 IsFlag(P, AddPending) == true &&
+			 IsFlag(P, Added) == false &&
+			 Cache[P].InstallVer == 0)
+			break;
+		  }
+		  if (Prov.end() == false)
+		     for (pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList();
+			  Prv.end() == false; ++Prv)
+		     {
+			pkgCache::PkgIterator const P = Prv.OwnerPkg();
+			if (IsFlag(P, InList) == true &&
+			    IsFlag(P, AddPending) == false &&
+			    Cache[P].InstallVer != 0 &&
+			    VisitNode(P) == true)
+			{
+			   tryFixDeps = false;
+			   break;
+			}
+		     }
+		  if (tryFixDeps == false)
+		     break;
+	       }
+
+	       // Check for Or groups
+	       if ((F->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or)
+		  continue;
+	       // Lets see if the package is part of the Or group
+	       pkgCache::DepIterator S = F;
+	       for (; S.end() == false; ++S)
+	       {
+		  if (S.TargetPkg() == D.TargetPkg())
+		     break;
+		  if ((S->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or ||
+		      CheckDep(S)) // Or group is satisfied by another package
+		     for (;S.end() == false; ++S);
+	       }
+	       if (S.end() == true)
+		  continue;
+	       // skip to the end of the or group
+	       for (;S.end() == false && (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; ++S);
+	       ++S;
+	       // The soon to be removed is part of the Or group
+	       // start again in the or group and find something which will serve as replacement
+	       for (; F.end() == false && F != S; ++F)
+	       {
+		  if (F.TargetPkg() == D.TargetPkg() ||
+		      IsFlag(F.TargetPkg(), InList) == false ||
+		      VisitNode(F.TargetPkg()) == false)
+		     continue;
+		  tryFixDeps = false;
+		  break;
+	       }
+	       if (tryFixDeps == false)
+		  break;
+	    }
+	 }
+
 	 // Skip over missing files
 	 if (IsMissing(D.ParentPkg()) == true)
 	    continue;
-- 
cgit v1.2.3


From 685625bd308f62a382aaf61f1621a18b9441edfd Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 29 Jul 2010 12:26:26 +0200
Subject: configure also the replacement before remove by adding Immediate flag

---
 apt-pkg/orderlist.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/orderlist.cc')

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index cb55147c3..602b63d3b 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -936,6 +936,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
 			    Cache[P].InstallVer != 0 &&
 			    VisitNode(P) == true)
 			{
+			   Flag(P, Immediate);
 			   tryFixDeps = false;
 			   break;
 			}
@@ -970,6 +971,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
 		      IsFlag(F.TargetPkg(), InList) == false ||
 		      VisitNode(F.TargetPkg()) == false)
 		     continue;
+		  Flag(F.TargetPkg(), Immediate);
 		  tryFixDeps = false;
 		  break;
 	       }
-- 
cgit v1.2.3