| commit | 07a429918293ffa86b76c0b55c8a1f662f2e569d | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue Jan 23 06:10:46 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 23 06:10:46 2018 +0000 |
| tree | 8d3cddb2b02289d1d99353f6fbd1b7c870605a52 | |
| parent | ae891fb19e69778e06644f69042bc397504a4d84 [diff] | |
| parent | a2a9f9990fb18ad4323ade0e8893e1d6e49614b6 [diff] |
Merge "Don't check the stderr output from bsdiff/imgdiff"
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