← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/generic/apt/download_update_manager.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/generic/apt/download_update_manager.cc
1
1
// download_update_manager.cc
2
2
//
3
 
//   Copyright (C) 2005, 2007-2009 Daniel Burrows
 
3
//   Copyright (C) 2005, 2007-2009, 2011 Daniel Burrows
4
4
//
5
5
//   This program is free software; you can redistribute it and/or
6
6
//   modify it under the terms of the GNU General Public License as
94
94
        }
95
95
    }
96
96
 
97
 
  fetcher = new pkgAcquire(&acqlog);
 
97
  fetcher = new pkgAcquire();
 
98
  fetcher->Setup(&acqlog);
98
99
 
99
100
  if(!src_list.GetIndexes(fetcher))
100
101
    {
328
329
  // redundant work at the command-line.
329
330
  {
330
331
    pkgCacheFile cachefile;
331
 
    if(!cachefile.BuildCaches(*progress, true))
 
332
    if(!cachefile.BuildCaches(progress, true))
332
333
      {
333
334
        _error->Error(_("Couldn't rebuild package cache"));
334
335
        k(failure);