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

Commit 43f9d449 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "adb: make the push summary fit in 80 columns." am: b2066fda 

Change-Id: I3c8753cac90f85d91c37ee2224b6acf26d33ec2c
parents 84c79e4e b2066fda

adb/client/file_sync_client.cpp

+5 −6
Original line number Diff line number Diff line
@@ -187,14 +187,13 @@ struct TransferLedger { 
        const char* direction_str = (direction == TransferDirection::push) ? "pushed" : "pulled";

        std::stringstream ss;

        if (!name.empty()) {

            ss << name << ": ";

            std::string_view display_name(name);

            char* out = getenv("ANDROID_PRODUCT_OUT");

            if (out) android::base::ConsumePrefix(&display_name, out);

            ss << display_name << ": ";

        }

        ss << files_transferred << " file" << ((files_transferred == 1) ? "" : "s") << " "

           << direction_str << ".";

        if (files_skipped > 0) {

            ss << " " << files_skipped << " file" << ((files_skipped == 1) ? "" : "s")

               << " skipped.";

        }

           << direction_str << ", " << files_skipped << " skipped.";

        ss << TransferRate();



        lp.Print(ss.str(), LinePrinter::LineType::INFO);