summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 13:51:48 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 13:51:48 +0100
commitfa9c66be294a16e49b61ba6db491c506ad08cde2 (patch)
treeca258788dad9c3eb9472973bb26017c3297cfa0c /apt-pkg/packagemanager.cc
parentc60f62f946a31132d159d306a6c26ac3c50a62f7 (diff)
cherry pick 2217.1.22
Diffstat (limited to 'apt-pkg/packagemanager.cc')
-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 9fe6a35fa..3f5b8c8ff 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -689,7 +689,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)
@@ -704,20 +703,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