← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/util/progress_meter.cpp

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/util/progress_meter.cpp
53
53
        
54
54
        if ( _total > 0 ) {
55
55
            int per = (int)( ( (double)_done * 100.0 ) / (double)_total );
56
 
            Nullstream& out = log() << "\t\t" << _done << "/" << _total << "\t" << per << "%";
 
56
            Nullstream& out = log() << "\t\t" << _name << ": " << _done
 
57
                                    << '/' << _total << '\t' << per << '%';
57
58
            
58
59
            if ( ! _units.empty() ) {
59
60
                out << "\t(" << _units << ")";
69
70
        if ( ! _active )
70
71
            return "";
71
72
        stringstream buf;
72
 
        buf << _done << "/" << _total << " " << (_done*100)/_total << "%";
 
73
        buf << _name << ": " << _done << '/' << _total << ' ' << (_done*100)/_total << '%';
73
74
        
74
75
        if ( ! _units.empty() ) {
75
76
            buf << "\t(" << _units << ")" << endl;