Attachment 883755 Details for Bug 1085042 – Improve error reporting on mkdir failure

[patch] Improve error reporting on mkdir failure

sos-bz1085042-improve-error-reporting-mkdir-failure.patch (text/plain), 1.68 KB, created by Bryn M. Reeves on 2014-04-07 19:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2014-04-07 19:43:18 UTC

Size: 1.68 KB

patch

obsolete

>commit 9936689ab86c536b29c6879168b9e774f84725e6
>Author: Bryn M. Reeves <bmr@redhat.com>
>Date:   Mon Apr 7 20:29:09 2014 +0100
>
>    Improve error reporting on mkdir failure
>    
>    Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
>
>diff --git a/sos/policyredhat.py b/sos/policyredhat.py
>index 7e6b2c1..0535a18 100755
>--- a/sos/policyredhat.py
>+++ b/sos/policyredhat.py
>@@ -203,7 +203,9 @@ class SosPolicy:
>         dstroot = os.path.join(os.path.abspath(tmpdir),uniqname)
>         try:
>             os.makedirs(dstroot, 0700)
>-        except:
>+        except Exception as e:
>+            print "Failed to create temporary directory:"
>+            print e
>             return False
>         return dstroot
> 
>diff --git a/sos/sosreport.py b/sos/sosreport.py
>index d24cf3f..862476c 100755
>--- a/sos/sosreport.py
>+++ b/sos/sosreport.py
>@@ -353,15 +353,21 @@ def sosreport(opts):
> 
>     GlobalVars.dstroot = GlobalVars.policy.getDstroot(GlobalVars.__cmdLineOpts__.tmp_dir)
>     if not GlobalVars.dstroot:
>-        print _("Could not create temporary directory.")
>-        doExit()
>+        print _("Aborting.")
>+        doExit(1)
> 
>     cmddir = os.path.join(GlobalVars.dstroot, "sos_commands")
>     logdir = os.path.join(GlobalVars.dstroot, "sos_logs")
>     rptdir = os.path.join(GlobalVars.dstroot, "sos_reports")
>-    os.mkdir(cmddir, 0755)
>-    os.mkdir(logdir, 0755)
>-    os.mkdir(rptdir, 0755)
>+    try:
>+        os.mkdir(cmddir, 0755)
>+        os.mkdir(logdir, 0755)
>+        os.mkdir(rptdir, 0755)
>+    except Exception as e:
>+        print _("Failed to create temporary directory:")
>+        print e
>+        print _("Aborting.")
>+        doExit(1)
> 
>     # initialize logging
>     soslog = logging.getLogger('sos')

Actions: View | Diff

Attachments on bug 1085042: 883724 | 883725 | 883755 | 883756 | 883757