only add 'skipping_baddisk' action when the notice is sent, skip it otherwise.

diff --git a/monitor/bootman.py b/monitor/bootman.py
index 3ebeafe..3053636 100755 (executable)
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -782,9 +782,11 @@ def restore_basic(sitehist, hostname, config=None, forced_action=None):
 
                                log=conn.get_dmesg().read()
                                sitehist.sendMessage('baddisk_notice', hostname=hostname, log=log)
-                               #conn.set_nodestate('disabled')
+                               return "skipping_baddisk"
+                       else:
+                               # NOTE: "" does not add a new action record
+                               return ""
 
-                       return "skipping_baddisk"
 
        print "...Downloading bm.log from %s" %hostname 
        log = conn.get_bootmanager_log()