commit b901c9884d5fb23cc58f8c2a878e6a1607dbb388
author Felipe Leme <felipeal@google.com> Wed Jul 27 19:23:09 2016 -0700
committer Felipe Leme <felipeal@google.com> Wed Aug 17 10:52:09 2016 -0700
tree 5707f9ae9fa12a130530b61cbaa0da1347d3074f
parent 09551da8f7686bc0b2de95ed97cbfedb16b8942f

Removed extra 'pulling file' message.

Taking a zip bugreport has 2 phases: generating the bugreport and
pulling the file.

Initially adb was printing 2 messages, but since the latter is almost
instantaneously, it could be confusing to have 2 lines...

Fixes: 30451250
Change-Id: I1c6cc6163492c1fb6064667dfdb7aaf6ed4c4c6f
(cherry picked from commit f7c38b4c03d75c9cb27610acab96f4e7f4169de8)

bugreport.cpp

diff --git a/bugreport.cpp b/bugreport.cpp
index 8a3eb08..64f01bd 100644
--- a/bugreport.cpp
+++ b/bugreport.cpp
@@ -30,7 +30,12 @@
 class BugreportStandardStreamsCallback : public StandardStreamsCallbackInterface {
   public:
     BugreportStandardStreamsCallback(const std::string& dest_file, bool show_progress, Bugreport* br)
-        : br_(br), dest_file_(dest_file), show_progress_(show_progress), status_(-1), line_() {
+        : br_(br),
+          dest_file_(dest_file),
+          line_message_(android::base::StringPrintf("generating %s", dest_file_.c_str())),
+          show_progress_(show_progress),
+          status_(-1),
+          line_() {
     }
 
     void OnStdout(const char* buffer, int length) {
@@ -62,12 +67,12 @@
         if (android::base::StartsWith(line, BUGZ_OK_PREFIX)) {
             if (show_progress_) {
                 // Make sure pull message doesn't conflict with generation message.
-                br_->UpdateProgress(dest_file_, 100, 100, true);
+                br_->UpdateProgress(line_message_, 100, 100);
             }
 
             const char* zip_file = &line[strlen(BUGZ_OK_PREFIX)];
             std::vector<const char*> srcs{zip_file};
-            status_ = br_->DoSyncPull(srcs, dest_file_.c_str(), true, dest_file_.c_str()) ? 0 : 1;
+            status_ = br_->DoSyncPull(srcs, dest_file_.c_str(), true, line_message_.c_str()) ? 0 : 1;
             if (status_ != 0) {
                 fprintf(stderr, "Could not copy file '%s' to '%s'\n", zip_file, dest_file_.c_str());
             }
@@ -96,6 +101,7 @@
 
     Bugreport* br_;
     const std::string dest_file_;
+    const std::string line_message_;
     bool show_progress_;
     int status_;
 
@@ -156,15 +162,11 @@
     return SendShellCommand(transport_type, serial, bugz_command, false, &bugz_callback);
 }
 
-void Bugreport::UpdateProgress(const std::string& file_name, int progress, int total,
-                               bool keep_info_line) {
+void Bugreport::UpdateProgress(const std::string& message, int progress, int total) {
     int progress_percentage = (progress * 100 / total);
-    line_printer_.Print(android::base::StringPrintf("[%3d%%] generating %s", progress_percentage,
-                                                    file_name.c_str()),
-                        LinePrinter::INFO);
-    if (keep_info_line) {
-        line_printer_.KeepInfoLine();
-    }
+    line_printer_.Print(
+        android::base::StringPrintf("[%3d%%] %s", progress_percentage, message.c_str()),
+        LinePrinter::INFO);
 }
 
 int Bugreport::SendShellCommand(TransportType transport_type, const char* serial,