lab_inventory: Let exceptions escape main()
Exceptions from the lab_inventory script should be allowed to escape
main so that callers can correctly handle the failure case.
BUG=chromium:835941
TEST=None
Change-Id: Ia75cda1c032cca31a5827cf56aeff2e564513515
Reviewed-on: https://chromium-review.googlesource.com/1048605
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@google.com>
diff --git a/site_utils/lab_inventory.py b/site_utils/lab_inventory.py
index ddd33af..1c4652c 100755
--- a/site_utils/lab_inventory.py
+++ b/site_utils/lab_inventory.py
@@ -1330,10 +1330,10 @@
_perform_inventory_reports(arguments)
except KeyboardInterrupt:
pass
- except EnvironmentError as e:
- logging.exception('Unexpected OS error: %s', e)
- except Exception as e:
- logging.exception('Unexpected exception: %s', e)
+ except (EnvironmentError, Exception):
+ # Our cron setup doesn't preserve stderr, so drop extra breadcrumbs.
+ logging.exception('Error escaped main')
+ raise
def get_inventory(afe):