Attachment 883757 Details for Bug 1085042 – Raise fatal IO exceptions in PluginBase

[patch] Raise fatal IO exceptions in PluginBase

sos-bz1085042-raise-fatal-io-errors.patch (text/plain), 1.16 KB, created by Bryn M. Reeves on 2014-04-07 19:47:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2014-04-07 19:47:21 UTC

Size: 1.16 KB

patch

obsolete

>commit 91f30641eb815d686e3a968e9ca56e9c4a47bb20
>Author: Bryn M. Reeves <bmr@redhat.com>
>Date:   Mon Apr 7 20:31:44 2014 +0100
>
>    Raise fatal IO exceptions in PluginBase
>    
>    Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
>
>diff --git a/sos/plugintools.py b/sos/plugintools.py
>index f4f7c0a..97deedf 100644
>--- a/sos/plugintools.py
>+++ b/sos/plugintools.py
>@@ -37,6 +37,7 @@ from time import time
> from itertools import *
> from collections import deque
> import fnmatch
>+import errno
> 
> class PluginException(Exception): pass
> 
>@@ -242,12 +243,14 @@ class PluginBase:
>         except PluginException:
>             self.soslog.debug("error copying file %s (already exists)" % (srcpath))
>             return
>-        except IOError:
>+        except IOError as e:
>+            if e.errno in (errno.ENOSPC, errno.EROFS):
>+                raise
>             self.soslog.info("error copying file %s (IOError)" % (srcpath))
>             return 
>         except:
>             self.soslog.exception("error copying file %s" % (srcpath))
>-            return 
>+            raise 
> 
>         self.copiedFiles.append({'srcpath':srcpath, 'dstpath':tdstpath, 'symlink':"no"}) # save in our list
>

Actions: View | Diff

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