Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f5ed79e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Explicitly show the destination filename for a bugreport." am: ca876d80 am: 3ff439fe 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1343880

Change-Id: I3ae6bb2b38c4d3df65c78e5cdb2bb6436f05638a
parents 100d1b12 3ff439fe

adb/client/bugreport.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,9 @@ class BugreportStandardStreamsCallback : public StandardStreamsCallbackInterface 
            SetLineMessage("pulling");

            SetLineMessage("pulling");

            status_ =

            status_ =

                br_->DoSyncPull(srcs, destination.c_str(), false, line_message_.c_str()) ? 0 : 1;

                br_->DoSyncPull(srcs, destination.c_str(), false, line_message_.c_str()) ? 0 : 1;

            if (status_ != 0) {

            if (status_ == 0) {

                printf("Bug report copied to %s\n", destination.c_str());

            } else {

                fprintf(stderr,

                fprintf(stderr,

                        "Bug report finished but could not be copied to '%s'.\n"

                        "Bug report finished but could not be copied to '%s'.\n"

                        "Try to run 'adb pull %s <directory>'\n"

                        "Try to run 'adb pull %s <directory>'\n"