From 58d8722ae200307c6832bc468c00ad0f66f0347c Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 18 Nov 2019 20:09:38 -0700
Subject: [PATCH] Always save HW-Diags debug data

---
 .bin/Scripts/functions/hw_diags.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 652c1365..37321b43 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1313,7 +1313,6 @@ def run_hw_tests(state):
     elif all_disk_tests_enabled and all_disks_passed:
       update_checkboxes = True
 
-
   # Ask to update checkboxes
   if update_checkboxes and ask('Update checkboxes using above results?'):
     # CPU checkboxes
@@ -1332,19 +1331,12 @@ def run_hw_tests(state):
     elif all_disk_tests_enabled and all_disks_passed:
       state.ost.set_disk_passed(state.ticket_id)
 
-  # Upload for review
-  if (ENABLED_UPLOAD_DATA
-      and DEBUG_MODE
-      and ask('Upload results for review?')):
-    try_and_print(
-      message='Saving debug reports...',
-      function=save_debug_reports,
-      state=state, global_vars=global_vars)
-    try_and_print(
-      message='Uploading Data...',
-      function=upload_logdir,
-      global_vars=global_vars,
-      reason='Review')
+  # Export debug data
+  try:
+    save_debug_reports(state=state, global_vars=global_vars)
+  except Exception:
+    # WHY?
+    pass
 
   # Done
   sleep(1)