[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4650/8267] wic: direct: don't catch ImagerError



commit 870171a205463e79970c0efa5928c7e84057a7bf
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Feb 9 20:16:45 2017 +0200

    wic: direct: don't catch ImagerError
    
    Don't transform ImagerError exception into warning.
    Let wic to catch it on the upper level.
    
    (From OE-Core rev: 0cc84c81dd4a776aa37c8d1bcdcc3fa3af78d1e4)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index a2bc4c4..9bcccb3 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -290,10 +290,7 @@ class DirectPlugin(ImagerPlugin):
 
     def cleanup(self):
         if self._image:
-            try:
-                self._image.cleanup()
-            except ImageError as err:
-                msger.warning("%s" % err)
+            self._image.cleanup()
 
         # Move results to the output dir
         if not os.path.exists(self.outdir):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]