From 8a380e6cc3c203d6c3ddefa0311015e614103569 Mon Sep 17 00:00:00 2001
From: Rod Smith <rod.smith@canonical.com>
Date: Thu, 2 Oct 2014 10:21:05 -0400
Subject: Made changes recommended by Daniel Manrique

---
 bin/disk_smart | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'bin')

diff --git a/bin/disk_smart b/bin/disk_smart
index 936a926..3606e49 100755
--- a/bin/disk_smart
+++ b/bin/disk_smart
@@ -158,17 +158,19 @@ def get_smart_entries(disk, type='selftest'):
 # output, False if such a message is not found. In the former case,
 # the in-progress message entries are logged.
 def in_progress(current_entries):
-    ret_val = False
-    for entry in current_entries:
-        if not isinstance(entry, str):
-            if entry['status'] == 'Self-test routine in progress':
-                logging.debug('%s %s %s %s' % (entry['number'],
-                                               entry['description'],
-                                               entry['status'],
-                                               entry['remaining']))
-                ret_val = True
-                break
-    return ret_val
+    statuses = [entry for entry in current_entries
+                if isinstance(entry, dict)
+                and 'status' in entry
+                and entry['status'] == 'Self-test routine in progress']
+    if statuses:
+        for entry in statuses:
+            logging.debug('%s %s %s %s' % (entry['number'],
+                                           entry['description'],
+                                           entry['status'],
+                                           entry['remaining']))
+            return True
+    else:
+        return False
 
 
 # Wait for SMART test to complete; no return value.
-- 
cgit v1.2.3