commit a988cae6090909978029110b6a2d701cd97067fe
author Tianjie Xu <xunchang@google.com> Tue Jan 23 19:00:55 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 23 19:00:55 2018 +0000
tree 3b003b3c4ea09b60407a5c69192c99ec70a840f0
parent d8432e2384a5b00861569df7663009705b34018b
parent 6b3337db4a5ce93d2acec4c4147eb5101557b06b

Merge "Don't check the stderr output from bsdiff/imgdiff" am: 07a4299182 am: 759dcbd1ed
am: 6b3337db4a

Change-Id: Ic845bffaa3e92b708188963ce7389e1b16b9045f

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index ebebd63..faadae9 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1385,7 +1385,7 @@
           p.kill()
           th.join()
 
-      if err or p.returncode != 0:
+      if p.returncode != 0:
         print("WARNING: failure running %s:\n%s\n" % (
             diff_program, "".join(err)))
         self.patch = None