Imported Upstream version 2.6.11upstream/2.6.11

1 files changed, 12 insertions, 7 deletions

diff --git a/src/mongo/util/progress_meter.cpp b/src/mongo/util/progress_meter.cpp
index 57ea9f728ec..e9cbbacaa8f 100644
--- a/src/mongo/util/progress_meter.cpp
+++ b/src/mongo/util/progress_meter.cpp
@@ -15,9 +15,11 @@
  *    limitations under the License.
  */
 
-#include "pch.h" // needed for log.h
-#include "progress_meter.h"
-#include "log.h"
+#include "mongo/pch.h" // needed for log.h
+
+#include "mongo/util/progress_meter.h"
+
+#include "mongo/util/log.h"
 
 using namespace std;
 
@@ -53,13 +55,16 @@ namespace mongo {
         
         if ( _total > 0 ) {
             int per = (int)( ( (double)_done * 100.0 ) / (double)_total );
-            Nullstream& out = log() << "\t\t" << _name << ": " << _done
-                                    << '/' << _total << '\t' << per << '%';
-            
+            LogstreamBuilder out = log();
+            out << "\t\t" << _name << ": " << _done;
+
+            if (_showTotal) {
+                out << '/' << _total << '\t' << per << '%';
+            }
+
             if ( ! _units.empty() ) {
                 out << "\t(" << _units << ")";
             }
-            
             out << endl;
         }
         _lastTime = t;