diff options
| author | Daniel Hartwig <mandyke@gmail.com> | 2012-06-20 22:45:01 +0800 |
|---|---|---|
| committer | Daniel Hartwig <mandyke@gmail.com> | 2012-06-20 22:45:01 +0800 |
| commit | d2189241d885d5f01b60c4a557ec628fcd8cae01 (patch) | |
| tree | b2f60c108ca2e950bc0d513215fef538da6ad2e8 /src/cmdline/cmdline_show.cc | |
| parent | 2f544c3c351591f0f30e9f3bdf2cc905f54b906a (diff) | |
| download | aptitude-d2189241d885d5f01b60c4a557ec628fcd8cae01.tar.gz | |
Use real candidate version, not default-release
Diffstat (limited to 'src/cmdline/cmdline_show.cc')
| -rw-r--r-- | src/cmdline/cmdline_show.cc | 9 |
1 files changed, 1 insertions, 8 deletions
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; |