openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: fix progress percentage when pulling symlinks." am: 453db013b0 am: c2102a7b8f 

am: f98dedc4d3

Change-Id: I94146268a26e99bda31113f27bb2fe6bebaba85e
This commit is contained in:
Josh Gao 2016-11-18 02:23:25 +00:00 committed by android-build-merger
parent a142c2415d f98dedc4d3
commit f1f06a3729
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adb/file_sync_client.cpp
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%.