commit 0b1aa4958f18b740f5bb929a30c6b18fc0520ec1
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 18 04:05:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 18 04:05:19 2021 +0000
tree 2bbd733beb27a66dd6c294b75357d72014498432
parent 97988980d069a6621975c277369bab255ba1c44c
parent 6bf54e3abb575acf6ce345fb8fcfb23cf6361254

Merge "When cargo errors, print an error about cargo.out."

scripts/cargo2android.py

diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py
index 8557a6d..7c43aad 100755
--- a/scripts/cargo2android.py
+++ b/scripts/cargo2android.py
@@ -1280,7 +1280,10 @@
           print('Running:', cmd)
         with open(cargo_out, 'a') as out_file:
           out_file.write('### Running: ' + cmd + '\n')
-        os.system(cmd)
+        ret = os.system(cmd)
+        if ret != 0:
+          print('*** There was an error while running cargo.  ' +
+                'See the cargo.out file for details.')
     if added_workspace:  # restore original Cargo.toml
       with open(cargo_toml, 'w') as out_file:
         out_file.writelines(cargo_toml_lines)