← Back to branch summary

~jr/ubuntu/oneiric/apt/bzr-get-rename

« back to all changes in this revision

Viewing changes to apt-pkg/depcache.cc

  • Committer: Bazaar Package Importer
  • Author(s): Matt Zimmerman
  • Date: 2005-03-07 20:08:33 UTC
  • Revision ID: james.westby@ubuntu.com-20050307200833-0lxdgg2cb4oculdv
Tags: 0.6.35
* Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
  - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
    from growing too large (Ubuntu #6761)
  - some comments about the pkgAcqMetaSig::Custom600Headers() added
  - use gpg --with-colons
  - commented the ftp no_proxy unseting in methods/ftp.cc
  - added support for "Acquire::gpgv::options" in methods/gpgv.cc
* Merge bubulle@debian.org--2005/apt--main--0
  - Make capitalization more consistent
  - Un-fuzzy translations resulting from capitalization changes
  - Italian translation update

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/depcache.cc
57
57
   if (Prog != 0)
58
58
   {
59
59
      Prog->OverallProgress(0,2*Head().PackageCount,Head().PackageCount,
60
 
                            _("Building Dependency Tree"));
61
 
      Prog->SubProgress(Head().PackageCount,_("Candidate Versions"));
 
60
                            _("Building dependency tree"));
 
61
      Prog->SubProgress(Head().PackageCount,_("Candidate versions"));
62
62
   }
63
63
   
64
64
   /* Set the current state of everything. In this state all of the
86
86
      
87
87
      Prog->OverallProgress(Head().PackageCount,2*Head().PackageCount,
88
88
                            Head().PackageCount,
89
 
                            _("Building Dependency Tree"));
90
 
      Prog->SubProgress(Head().PackageCount,_("Dependency Generation"));
 
89
                            _("Building dependency tree"));
 
90
      Prog->SubProgress(Head().PackageCount,_("Dependency generation"));
91
91
   }
92
92
   
93
93
   Update(Prog);