← Back to branch summary

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

« back to all changes in this revision

Viewing changes to apt-pkg/contrib/progress.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/contrib/progress.cc
1
1
// -*- mode: cpp; mode: fold -*-
2
2
// Description                                                          /*{{{*/
3
 
// $Id: progress.cc,v 1.11 2001/05/07 05:25:13 jgg Exp $
 
3
// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $
4
4
/* ######################################################################
5
5
   
6
6
   OpProgress - Operation Progress
151
151
   {
152
152
      char S[300];
153
153
      if (_error->PendingError() == true)
154
 
         snprintf(S,sizeof(S),_("\r%s... Error!"),OldOp.c_str());
 
154
         snprintf(S,sizeof(S),_("%c%s... Error!"),'\r',OldOp.c_str());
155
155
      else
156
 
         snprintf(S,sizeof(S),_("\r%s... Done"),OldOp.c_str());
 
156
         snprintf(S,sizeof(S),_("%c%s... Done"),'\r',OldOp.c_str());
157
157
      Write(S);
158
158
      cout << endl;
159
159
      OldOp = string();