← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aptitude/vivid

« back to all changes in this revision

Viewing changes to src/cmdline/cmdline_forget_new.cc

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-22 12:32:56 UTC
  • mfrom: (1.8.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110622123256-8aox9w9ch3x72dci
Tags: 0.6.4-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/05aptitude: never autoremove kernels
  - drop aptitude-doc to Suggests
  - 03_branding.dpatch: ubuntu branding
  - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com
  - 09_ubuntu_fortify_source.dpatch: Suppress a number of warnings (turned
    into errors by -Werror) triggered by Ubuntu's default of
    -D_FORTIFY_SOURCE=2.
  - 11_ubuntu_uses_sudo.dpatch: fix status line of 'Become root' menu entry
    to not refer to su.
  - 12_point_manpage_to_doc_package.dpatch: point Finnish manpage to the
    correct place for further info
  - 14_html2text_preferred.dpatch: switch back to html2text in favor of
    elinks, since html2text is in main and elinks isn't.
* dropped 01_intltool_update.dpatch
* updated 15_ftbfs_new_apt

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmdline/cmdline_forget_new.cc
38
38
using namespace std;
39
39
 
40
40
using aptitude::cmdline::create_terminal;
41
 
using aptitude::cmdline::create_terminal_locale;
42
41
using aptitude::cmdline::make_text_progress;
43
 
using aptitude::cmdline::terminal;
44
 
using aptitude::cmdline::terminal_locale;
 
42
using aptitude::cmdline::terminal_io;
45
43
using boost::shared_ptr;
46
44
 
47
45
int cmdline_forget_new(int argc, char *argv[],
48
46
                       const char *status_fname, bool simulate)
49
47
{
50
 
  const shared_ptr<terminal> term = create_terminal();
51
 
  const shared_ptr<terminal_locale> term_locale = create_terminal_locale();
 
48
  const shared_ptr<terminal_io> term = create_terminal();
52
49
 
53
50
  _error->DumpErrors();
54
51
 
60
57
      return -1;
61
58
    }  
62
59
 
63
 
  shared_ptr<OpProgress> progress = make_text_progress(false, term, term_locale);
 
60
  shared_ptr<OpProgress> progress = make_text_progress(false, term, term, term);
64
61
 
65
62
  apt_init(progress.get(), false, status_fname);
66
63