Attachment 310881 Details for Bug 386691 – Properly sets default empty values for --name and --ticket-number.

[patch] Properly sets default empty values for --name and --ticket-number.

sosreport.patch (text/plain), 3.01 KB, created by Robert Jackson on 2008-07-03 05:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Jackson

Created: 2008-07-03 05:38:57 UTC

Size: 3.01 KB

patch

obsolete

>--- /usr/sbin/sosreport 2008-03-28 10:28:49.000000000 -0400              
>+++ /usr/sbin/sosreport2        2008-07-03 01:09:10.000000000 -0400      
>@@ -142,6 +142,12 @@                                                     
> __cmdParser__.add_option("--no-multithread", action="store_true", \     
>                      dest="nomultithread", \                            
>                      help="disable multi-threaded gathering mode (slower)", default=False)
>+__cmdParser__.add_option("--name", action="store", \                                      
>+                    dest="name",type="string", \                                          
>+                    help="first initial and last name.", default="")                      
>+__cmdParser__.add_option("--ticket-number", action="store", \                             
>+                    dest="ticketnumber", type="string", \                                 
>+                    help="ticket number.", default="")                                    
>                                                                                           
> if sys.argv[0].endswith("sysreport"):                                                     
>     try:                                                                                  
>@@ -538,9 +544,12 @@                                                                       
>     if not len(loadedplugins):
>         soslog.error(_("no valid plugins were enabled"))
>         sys.exit(1)
>-
>-    try:
>-        raw_input(_("""This utility will collect some detailed  information about the
>+
>+    isUnattended = False
>+    if len(__cmdLineOpts__.name) > 0 and len(__cmdLineOpts__.ticketnumber) > 0: isUnattended = True
>+    if not isUnattended:
>+        try:
>+            raw_input(_("""This utility will collect some detailed  information about the
> hardware and  setup of your  Red Hat Enterprise Linux  system.
> The information is collected and an archive is  packaged under
> /tmp, which you can send to a support representative.
>@@ -552,9 +561,9 @@
>
> Press ENTER to continue, or CTRL-C to quit.
> """))
>-    except KeyboardInterrupt:
>-        print
>-        sys.exit(0)
>+        except KeyboardInterrupt:
>+            print
>+            sys.exit(0)
>
>     # Call the diagnose() method for each plugin
>     tmpcount = 0
>@@ -583,7 +592,10 @@
>         print
>         try:
>            while True:
>-              yorno = raw_input( _("Are you sure you would like to continue (y/n) ? ") )
>+              if not isUnattended:
>+                 yorno = raw_input( _("Are you sure you would like to continue (y/n) ? ") )
>+             else:
>+                 yorno = _("Y")
>               if yorno == _("y") or yorno == _("Y"):
>                  print
>                  break
>@@ -594,7 +606,10 @@
>            print
>            sys.exit(0)
>
>-    policy.preWork()
>+    if isUnattended:
>+       policy.preWork(__cmdLineOpts__.name, __cmdLineOpts__.ticketnumber)
>+    else:
>+       policy.preWork()
>
>     # Call the setup() method for each plugin
>     for plugname, plug in loadedplugins:
>

Actions: View | Diff

Attachments on bug 386691: 310878 | 310879 | 310880 | 310881 | 315268