commit e78ed3ed49e3c6b4a4c9e4bed5ed206bae61817f
author Rob Seymour <rseymour@google.com> Thu Oct 06 00:40:11 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 06 00:40:11 2022 +0000
tree c50f18475d20b3314eb4073e1c63f930af042071
parent a93e7417aaa42fc3f71dcc62030b969d18d3b90a
parent dc4e0f2ee0147b01f4438e21aaaae1cf6cb3d55b

Merge "Update check_target_files_vintf to check the last line of stdout."

tools/releasetools/check_target_files_vintf.py

diff --git a/tools/releasetools/check_target_files_vintf.py b/tools/releasetools/check_target_files_vintf.py
index 4a2a905..63a6cf7 100755
--- a/tools/releasetools/check_target_files_vintf.py
+++ b/tools/releasetools/check_target_files_vintf.py
@@ -142,9 +142,10 @@
     command = common_command + sku_args
     proc = common.Run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = proc.communicate()
+    last_out_line = out.split()[-1] if out != "" else out
     if proc.returncode == 0:
       logger.info("Command `%s` returns 'compatible'", ' '.join(command))
-    elif out.strip() == "INCOMPATIBLE":
+    elif last_out_line.strip() == "INCOMPATIBLE":
       logger.info("Command `%s` returns 'incompatible'", ' '.join(command))
       success = False
     else: