From 50c00e555ed0120e2e60382b71aecea7c8746a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 15 Jan 2014 03:57:59 +0100
Subject: [PATCH] backups: make cleanup code more defensive

If we are killing remaining processes in cause of exception, ignore
failure here (OSError is raised in case of non existing process).
---
 core/backup.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/backup.py b/core/backup.py
index 758c4e9e..ffab7304 100644
--- a/core/backup.py
+++ b/core/backup.py
@@ -749,10 +749,13 @@ class ExtractWorker(Process):
                     self.tar2_process]:
                 if process:
                     # FIXME: kill()?
-                    process.terminate()
+                    try:
+                        process.terminate()
+                    except OSError:
+                        pass
                     process.wait()
             self.error_callback(str(e))
-            raise
+            raise e
 
     def __run__(self):
         if BACKUP_DEBUG: