Handle missing filters as higher level restore errors

1 files changed, 13 insertions, 8 deletions

diff --git a/obnamlib/plugins/restore_plugin.py b/obnamlib/plugins/restore_plugin.py
index 9f90a70c..84f1ee10 100644
--- a/obnamlib/plugins/restore_plugin.py
+++ b/obnamlib/plugins/restore_plugin.py
@@ -194,14 +194,19 @@ class RestorePlugin(obnamlib.ObnamPlugin):
             f = self.fs.open('./' + filename, 'wb')
             summer = self.repo.new_checksummer()
 
-            contents = self.repo.get_file_data(gen, filename)
-            if contents is None:
-                chunkids = self.repo.get_file_chunks(gen, filename)
-                self.restore_chunks(f, chunkids, summer)
-            else:
-                f.write(contents)
-                summer.update(contents)
-            
+            try:
+                contents = self.repo.get_file_data(gen, filename)
+                if contents is None:
+                    chunkids = self.repo.get_file_chunks(gen, filename)
+                    self.restore_chunks(f, chunkids, summer)
+                else:
+                    f.write(contents)
+                    summer.update(contents)
+            except obnamlib.MissingFilterError, e:
+                msg = 'Missing filter error during restore: %s' % filename
+                logging.error(msg)
+                self.app.ts.notify(msg)
+                self.errors = True
             f.close()
 
             correct_checksum = metadata.md5