Attachment 883756 Details for Bug 1085042 – Abort run on fatal IO exceptions

[patch] Abort run on fatal IO exceptions

sos-bz1085042-abort-on-io-exceptions.patch (text/plain), 1.58 KB, created by Bryn M. Reeves on 2014-04-07 19:46:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2014-04-07 19:46:30 UTC

Size: 1.58 KB

patch

obsolete

>commit 7b957f6c1485d3b928a1f7db82d7c69bef173396
>Author: Bryn M. Reeves <bmr@redhat.com>
>Date:   Mon Apr 7 20:30:05 2014 +0100
>
>    Abort run on fatal IO exceptions
>    
>    Abort the run if a plugin hits a fatal write IO exception (EROFS,
>    ENOSPC). Do not clean up the temporary tree.
>    
>    Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
>
>diff --git a/sos/sosreport.py b/sos/sosreport.py
>index 862476c..f27df40 100755
>--- a/sos/sosreport.py
>+++ b/sos/sosreport.py
>@@ -45,6 +45,7 @@ from time import strftime, localtime
> from itertools import *
> from collections import deque
> from textwrap import fill
>+import errno
> 
> from sos import _sos as _
> from sos import __version__
>@@ -733,6 +734,13 @@ No changes will be made to system configuration.
>     for plugname, plug in GlobalVars.loadedplugins:
>         try:
>             plug.setup()
>+        except IOError as e:
>+            if e.errno in (errno.ENOSPC, errno.EROFS):
>+                print _("Fatal error writing archive:")
>+                print e
>+                print _("Aborting.")
>+                doExit(1)
>+
>         except KeyboardInterrupt:
>             raise
>         except:
>@@ -756,6 +764,13 @@ No changes will be made to system configuration.
>         plugname, plug = i[0]
>         try:
>             plug.copyStuff()
>+        except IOError as e:
>+            if e.errno in (errno.ENOSPC, errno.EROFS):
>+                print
>+                print _("Fatal error writing archive:")
>+                print e
>+                print _("Aborting.")
>+                doExit(1)
>         except KeyboardInterrupt:
>             raise
>         except:

Actions: View | Diff

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