From a2a9f9990fb18ad4323ade0e8893e1d6e49614b6 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Fri, 5 Jan 2018 15:15:54 -0800
Subject: [PATCH] Don't check the stderr output from bsdiff/imgdiff

bsdiff/imgdiff returns non-zero values correctly in case of failures.
So we don't need to check the stderr anymore. This avoids some false
reports of the diff program.

Bug: 72335938
Bug: 71505046
Test: Check the exit value of bsdiff/imgdiff in code search,
      generate a package for angler.

Change-Id: I18f0c3882a40a5288d6aee715713a05270e0db2b
---
 tools/releasetools/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index ebebd6388e..faadae9706 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1385,7 +1385,7 @@ class Difference(object):
           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