darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Revert "depcache.cc: optimize CheckDep() calls for Now/Install/Candidate versions"

Browse Source 
This reverts commit c3ca6b81bc.
This commit is contained in:
Alexey Tourbin 2011-01-27 03:58:31 +03:00
parent 6cec139b53
commit c961480233
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apt/apt-pkg/depcache.cc
View File

@ -506,19 +506,9 @@ unsigned char pkgDepCache::DependencyState(DepIterator &D)
if (CheckDep(D,NowVersion) == true) if (CheckDep(D,NowVersion) == true)
State |= DepNow; State |= DepNow;
if (CheckDep(D,InstallVersion) == true)
PkgIterator Pkg = D.TargetPkg();
Version *CurrentVer = Pkg.CurrentVer();
Version *InstallVer = PkgState[Pkg->ID].InstallVer;
Version *CandidateVer = PkgState[Pkg->ID].CandidateVer;
if ((InstallVer == CurrentVer && (State & DepNow)) ||
CheckDep(D,InstallVersion) == true)
State |= DepInstall; State |= DepInstall;
if (CheckDep(D,CandidateVersion) == true)
if ((CandidateVer == CurrentVer && (State & DepNow)) ||
(CandidateVer == InstallVer && (State & DepInstall)) ||
CheckDep(D,CandidateVersion) == true)
State |= DepCVer; State |= DepCVer;
return State; return State;