Blame SOURCES/0033-navicli-catch-exception-if-input-is-unreadable.patch

0cd6dc
From 465746d768ce69684eee57eaa3509d9ae898fee2 Mon Sep 17 00:00:00 2001
0cd6dc
From: "Bryn M. Reeves" <bmr@redhat.com>
0cd6dc
Date: Wed, 17 Dec 2014 12:39:05 +0000
0cd6dc
Subject: [PATCH 33/93] [navicli] catch exception if input is unreadable
0cd6dc
0cd6dc
CLARiiON SP IP Address or [Enter] to exit: Traceback (most recent call last):
0cd6dc
  File "/usr/sbin/sosreport", line 25, in <module>
0cd6dc
    main(sys.argv[1:])
0cd6dc
  File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1408, in main
0cd6dc
    sos.execute()
0cd6dc
  File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1387, in execute
0cd6dc
    self.setup()
0cd6dc
  File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1117, in setup
0cd6dc
    plug.setup()
0cd6dc
  File "/usr/lib/python2.7/site-packages/sos/plugins/navicli.py", line 72, in setup
0cd6dc
    ans = input("CLARiiON SP IP Address or [Enter] to exit: ")
0cd6dc
EOFError: EOF when reading a line
0cd6dc
0cd6dc
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
0cd6dc
---
0cd6dc
 sos/plugins/navicli.py | 5 ++++-
0cd6dc
 1 file changed, 4 insertions(+), 1 deletion(-)
0cd6dc
0cd6dc
diff --git a/sos/plugins/navicli.py b/sos/plugins/navicli.py
0cd6dc
index 5175f89..3ee7d50 100644
0cd6dc
--- a/sos/plugins/navicli.py
0cd6dc
+++ b/sos/plugins/navicli.py
0cd6dc
@@ -69,7 +69,10 @@ class Navicli(Plugin, RedHatPlugin):
0cd6dc
         CLARiiON_IP_address_list = []
0cd6dc
         CLARiiON_IP_loop = "stay_in"
0cd6dc
         while CLARiiON_IP_loop == "stay_in":
0cd6dc
-            ans = input("CLARiiON SP IP Address or [Enter] to exit: ")
0cd6dc
+            try:
0cd6dc
+                ans = input("CLARiiON SP IP Address or [Enter] to exit: ")
0cd6dc
+            except:
0cd6dc
+                return
0cd6dc
             if self.check_ext_prog("navicli -h %s getsptime" % (ans,)):
0cd6dc
                 CLARiiON_IP_address_list.append(ans)
0cd6dc
             else:
0cd6dc
-- 
0cd6dc
1.9.3
0cd6dc