summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-03-03 11:43:21 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-03-03 11:43:21 +0100
commit440d3d654a5f85e8b5c0472e91f425fbac9541b8 (patch)
treeb110a5a9f518ef3f095037899565a2fd019d16d4 /apt-pkg
parentd73840dc51fe0762e0d170c47e07e13211a0de95 (diff)
* apt-pkg/packagemanager.cc:
- do not try to a void a breaks if the broken package pre-depends on the breaker, but let dpkg auto-deconfigure it
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/packagemanager.cc52
1 files changed, 40 insertions, 12 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 2738a8a6b..05eb1a06b 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -680,7 +680,6 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
{
VerIterator Ver(Cache,*I);
PkgIterator BrokenPkg = Ver.ParentPkg();
- VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
if (BrokenPkg.CurrentVer() != Ver)
{
if (Debug)
@@ -695,20 +694,49 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
// This dependancy has already been dealt with by another SmartUnPack on Pkg
break;
} else {
- // Found a break, so unpack the package,
+ // Found a break, so see if we can unpack the package to avoid it
// but do not set loop if another SmartUnPack already deals with it
- if (Debug)
+ VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+ bool circle = false;
+ for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D)
+ {
+ if (D->Type != pkgCache::Dep::PreDepends)
+ continue;
+ SPtrArray<Version *> VL = D.AllTargets();
+ for (Version **I = VL; *I != 0; ++I)
+ {
+ VerIterator V(Cache,*I);
+ PkgIterator P = V.ParentPkg();
+ // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
+ if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
+ continue;
+ circle = true;
+ break;
+ }
+ if (circle == true)
+ break;
+ }
+ if (circle == true)
+ {
+ if (Debug)
+ cout << OutputInDepth(Depth) << " Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
+ continue;
+ }
+ else
{
- cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.Name() << " to avoid " << End;
- if (PkgLoop == true)
- cout << " (Looping)";
- cout << std::endl;
+ if (Debug)
+ {
+ cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
+ if (PkgLoop == true)
+ cout << " (Looping)";
+ cout << std::endl;
+ }
+ if (PkgLoop == false)
+ List->Flag(Pkg,pkgOrderList::Loop);
+ SmartUnPack(BrokenPkg, false, Depth + 1);
+ if (PkgLoop == false)
+ List->RmFlag(Pkg,pkgOrderList::Loop);
}
- if (PkgLoop == false)
- List->Flag(Pkg,pkgOrderList::Loop);
- SmartUnPack(BrokenPkg, false, Depth + 1);
- if (PkgLoop == false)
- List->RmFlag(Pkg,pkgOrderList::Loop);
}
} else {
// Check if a package needs to be removed