1 files changed, 0 insertions, 97 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 7059b0a79..111e43cd6 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -132,103 +132,6 @@ bool pkgPolicy::InitDefaults()
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg)
 {
-   if (_config->FindI("APT::Policy", 1) >= 1) {
-      return GetCandidateVerNew(Pkg);
-   }
-
-   // Look for a package pin and evaluate it.
-   signed Max = GetPriority(Pkg);
-   pkgCache::VerIterator Pref = GetMatch(Pkg);
-
-   // Alternatives in case we can not find our package pin (Bug#512318).
-   signed MaxAlt = 0;
-   pkgCache::VerIterator PrefAlt;
-
-   // no package = no candidate version
-   if (Pkg.end() == true)
-      return Pref;
-
-   // packages with a pin lower than 0 have no newer candidate than the current version
-   if (Max < 0)
-      return Pkg.CurrentVer();
-
-   /* Falling through to the default version.. Setting Max to zero
-      effectively excludes everything <= 0 which are the non-automatic
-      priorities.. The status file is given a prio of 100 which will exclude
-      not-automatic sources, except in a single shot not-installed mode.
-
-      The user pin is subject to the same priority rules as default 
-      selections. Thus there are two ways to create a pin - a pin that
-      tracks the default when the default is taken away, and a permanent
-      pin that stays at that setting.
-    */
-   bool PrefSeen = false;
-   for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
-   {
-      /* Lets see if this version is the installed version */
-      bool instVer = (Pkg.CurrentVer() == Ver);
-
-      if (Pref == Ver)
-	 PrefSeen = true;
-
-      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)
-      {
-	 /* If this is the status file, and the current version is not the
-	    version in the status file (ie it is not installed, or somesuch)
-	    then it is not a candidate for installation, ever. This weeds
-	    out bogus entries that may be due to config-file states, or
-	    other. */
-	 if (VF.File().Flagged(pkgCache::Flag::NotSource) && instVer == false)
-	    continue;
-
-	 signed Prio = PFPriority[VF.File()->ID];
-	 if (Prio > Max)
-	 {
-	    Pref = Ver;
-	    Max = Prio;
-	    PrefSeen = true;
-	 }
-	 if (Prio > MaxAlt)
-	 {
-	    PrefAlt = Ver;
-	    MaxAlt = Prio;
-	 }
-      }
-
-      if (instVer == true && Max < 1000)
-      {
-	 /* Not having seen the Pref yet means we have a specific pin below 1000
-	    on a version below the current installed one, so ignore the specific pin
-	    as this would be a downgrade otherwise */
-	 if (PrefSeen == false || Pref.end() == true)
-	 {
-	    Pref = Ver;
-	    PrefSeen = true;
-	 }
-	 /* Elevate our current selection (or the status file itself) so that only
-	    a downgrade can override it from now on */
-	 Max = 999;
-
-	 // Fast path optimize.
-	 if (StatusOverride == false)
-	    break;
-      }
-   }
-   // If we do not find our candidate, use the one with the highest pin.
-   // This means that if there is a version available with pin > 0; there
-   // will always be a candidate (Closes: #512318)
-   if (!Pref.IsGood() && MaxAlt > 0)
-       Pref = PrefAlt;
-
-   return Pref;
-}
-									/*}}}*/
-// Policy::GetCandidateVerNew - Get the candidate install version	/*{{{*/
-// ---------------------------------------------------------------------
-/* Evaluate the package pins and the default list to deteremine what the
-   best package is. */
-pkgCache::VerIterator pkgPolicy::GetCandidateVerNew(pkgCache::PkgIterator const &Pkg)
-{
    // TODO: Replace GetCandidateVer()
    pkgCache::VerIterator cand;
    pkgCache::VerIterator cur = Pkg.CurrentVer();