drop obsolete explicit :none handling in pkgCacheGen

[apt.git] / apt-pkg / depcache.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 6271a024a4aa6c340c8bc518e7489537123382d5..7b1448c73e34a2b960a68dfbb933b8ae8381d27d 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -348,22 +348,21 @@ bool pkgDepCache::CheckDep(DepIterator const &Dep,int const Type,PkgIterator &Re
       bug. Conflicts may never self match */
    if (Dep.IsIgnorable(Res) == false)
    {
-      PkgIterator Pkg = Dep.TargetPkg();
       // Check the base package
       if (Type == NowVersion)
       {
-        if (Pkg->CurrentVer != 0 && Dep.IsSatisfied(Pkg.CurrentVer()) == true)
+        if (Res->CurrentVer != 0 && Dep.IsSatisfied(Res.CurrentVer()) == true)
            return true;
       }
       else if (Type == InstallVersion)
       {
-        if (PkgState[Pkg->ID].InstallVer != 0 &&
-              Dep.IsSatisfied(PkgState[Pkg->ID].InstVerIter(*this)) == true)
+        if (PkgState[Res->ID].InstallVer != 0 &&
+              Dep.IsSatisfied(PkgState[Res->ID].InstVerIter(*this)) == true)
            return true;
       }
       else if (Type == CandidateVersion)
-        if (PkgState[Pkg->ID].CandidateVer != 0 &&
-              Dep.IsSatisfied(PkgState[Pkg->ID].CandidateVerIter(*this)) == true)
+        if (PkgState[Res->ID].CandidateVer != 0 &&
+              Dep.IsSatisfied(PkgState[Res->ID].CandidateVerIter(*this)) == true)
            return true;
    }