commit 81c01a9adcfb8d387b1d07d90f46bde1a875bd00
author Tao Bao <tbao@google.com> Mon Mar 13 19:19:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 13 19:19:14 2017 +0000
tree 0f25c3cd85a45ed05d65a1d21a1c1e19facb9170
parent 82e63d3037a51709c566709d9357c8f60b8e3441
parent e5b2ff2a97f317f78a1b6b162d57881ae1dc2176

Merge "releasetools: Fix the diff_worker progress report."
am: e5b2ff2a97

Change-Id: Iafdf8970a25092a2bb13fe9f51c91f36fd66d859

tools/releasetools/blockimgdiff.py

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index ed087c1..d8fcc41 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -718,6 +718,9 @@
 
       diff_total = len(diff_queue)
       patches = [None] * diff_total
+      if sys.stdout.isatty():
+        global diff_done
+        diff_done = 0
 
       # Using multiprocessing doesn't give additional benefits, due to the
       # pattern of the code. The diffing work is done by subprocess.call, which
@@ -758,7 +761,9 @@
           with lock:
             patches[patch_index] = (xf_index, patch)
             if sys.stdout.isatty():
-              progress = len(patches) * 100 / diff_total
+              global diff_done
+              diff_done += 1
+              progress = diff_done * 100 / diff_total
               # '\033[K' is to clear to EOL.
               print(' [%d%%] %s\033[K' % (progress, xf.tgt_name), end='\r')
               sys.stdout.flush()