diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-14 20:30:15 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-14 20:30:15 +0200 |
| commit | 3e60519c4a2f7baf59553f94700646f4fef4d28d (patch) | |
| tree | 0b5c7deb860eed58c40c472bb62c6fa00e281af6 /apt-pkg/orderlist.cc | |
| parent | cbfc289d6eb2711ef12033e4eb024befd0b31815 (diff) | |
| parent | 75a90b93257ea81d42331c03b56bd6589c62e065 (diff) | |
merged from donkult
Diffstat (limited to 'apt-pkg/orderlist.cc')
| -rw-r--r-- | apt-pkg/orderlist.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 80d7b6619..0ac9a83e3 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -1059,8 +1059,10 @@ bool pkgOrderList::AddLoop(DepIterator D) Loops[LoopCount++] = D; // Mark the packages as being part of a loop. - Flag(D.TargetPkg(),Loop); - Flag(D.ParentPkg(),Loop); + //Flag(D.TargetPkg(),Loop); + //Flag(D.ParentPkg(),Loop); + /* This is currently disabled because the Loop flag is being used for + loop management in the package manager. Check the orderlist.h file for more info */ return true; } /*}}}*/ @@ -1111,7 +1113,7 @@ bool pkgOrderList::CheckDep(DepIterator D) just needs one */ if (D.IsNegative() == false) { - // ignore provides by older versions of this package + // ignore provides by older versions of this package if (((D.Reverse() == false && Pkg == D.ParentPkg()) || (D.Reverse() == true && Pkg == D.TargetPkg())) && Cache[Pkg].InstallVer != *I) |