Use real candidate version, not default-release

3 files changed, 1 insertions, 23 deletions

diff --git a/src/cmdline/cmdline_changelog.cc b/src/cmdline/cmdline_changelog.cc
index 3c01fc49..5615cfd2 100644
--- a/src/cmdline/cmdline_changelog.cc
+++ b/src/cmdline/cmdline_changelog.cc
@@ -287,8 +287,6 @@ void do_cmdline_changelog(const vector<string> &packages,
 	pager="more";
     }
 
-  string default_release = aptcfg->Find("APT::Default-Release");
-
   _error->PushToStack();
   for(vector<string>::const_iterator i=packages.begin(); i!=packages.end(); ++i)
     {
@@ -304,12 +302,6 @@ void do_cmdline_changelog(const vector<string> &packages,
       if(!cmdline_parse_source(input, source, package, sourcestr))
 	continue;
 
-      if(source == cmdline_version_cand && !default_release.empty())
-	{
-	  source    = cmdline_version_archive;
-	  sourcestr = default_release;
-	}
-
       pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(package);
 
       temp::name filename;
diff --git a/src/cmdline/cmdline_download.cc b/src/cmdline/cmdline_download.cc
index 8eede4d6..4b4044d0 100644
--- a/src/cmdline/cmdline_download.cc
+++ b/src/cmdline/cmdline_download.cc
@@ -67,7 +67,6 @@ int cmdline_download(int argc, char *argv[])
   pkgAcquire fetcher;
   fetcher.Setup(progress_display.first);
   string filenames[(*apt_cache_file)->Head().PackageCount];
-  string default_release = aptcfg->Find("APT::Default-Release");
 
   for(int i=1; i<argc; ++i)
     {
@@ -76,12 +75,6 @@ int cmdline_download(int argc, char *argv[])
       if(!cmdline_parse_source(argv[i], source, name, sourcestr))
 	continue;
 
-      if(source == cmdline_version_cand && !default_release.empty())
-	{
-	  source = cmdline_version_archive;
-	  sourcestr = default_release;
-	}
-
       pkgset packages;
       if(aptitude::cmdline::pkgset_from_string(&packages, name) == false)
         continue;
diff --git a/src/cmdline/cmdline_show.cc b/src/cmdline/cmdline_show.cc
index 018c07c7..56431c26 100644
--- a/src/cmdline/cmdline_show.cc
+++ b/src/cmdline/cmdline_show.cc
@@ -561,9 +561,8 @@ bool do_cmdline_show_target(const pkgCache::PkgIterator &pkg,
 
 bool do_cmdline_show(string s, int verbose, const shared_ptr<terminal_metrics> &term_metrics)
 {
-  cmdline_version_source source = cmdline_version_curr_or_cand;
+  cmdline_version_source source = cmdline_version_cand;
   string name, sourcestr;
-  string default_release = aptcfg->Find("APT::Default-Release");
   bool has_explicit_source = false;
 
   if(!cmdline_parse_source(s, source, name, sourcestr))
@@ -571,12 +570,6 @@ bool do_cmdline_show(string s, int verbose, const shared_ptr<terminal_metrics> &
 
   has_explicit_source = (source != cmdline_version_cand);
 
-  if(source == cmdline_version_cand && !default_release.empty())
-    {
-      source    = cmdline_version_archive;
-      sourcestr = default_release;
-    }
-
   pkgset pkgset;
   if(aptitude::cmdline::pkgset_from_string(&pkgset, name, GlobalError::NOTICE) == false)
     return false;