ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Change-Id: I3c8753cac90f85d91c37ee2224b6acf26d33ec2c
This commit is contained in:
Automerger Merge Worker 2020-01-31 16:11:50 +00:00
commit 43f9d449b9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
adb/client/file_sync_client.cpp
View file

@ -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);