Merge "adb: fix progress percentage when pulling symlinks."

This commit is contained in:
Treehugger Robot 2016-11-18 02:13:18 +00:00 committed by Gerrit Code Review
commit 453db013b0

View file

@ -149,7 +149,7 @@ struct TransferLedger {
void ReportProgress(LinePrinter& lp, const std::string& file, uint64_t file_copied_bytes,
uint64_t file_total_bytes) {
char overall_percentage_str[5] = "?";
if (bytes_expected != 0) {
if (bytes_expected != 0 && bytes_transferred <= bytes_expected) {
int overall_percentage = static_cast<int>(bytes_transferred * 100 / bytes_expected);
// If we're pulling symbolic links, we'll pull the target of the link rather than
// just create a local link, and that will cause us to go over 100%.