[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6146/8267] wic: Remove obsolete reference to msger logger.



commit 1c8cfd074ba2c888e57af1792ed834eb267d70a1
Author: Kristian Amlie <kristian amlie mender io>
Date:   Tue May 30 09:56:59 2017 +0200

    wic: Remove obsolete reference to msger logger.
    
    This was overlooked when msger was removed in 28014087b8091.
    
    (From OE-Core rev: b561292c4e7b5578172066f82b6518b5bda53f42)
    
    Signed-off-by: Kristian Amlie <kristian amlie mender io>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/rootfs.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index f2e2ca8..944ec5f 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -28,6 +28,7 @@
 import logging
 import os
 import shutil
+import sys
 
 from oe.path import copyhardlinktree
 
@@ -98,7 +99,8 @@ class RootfsPlugin(SourcePlugin):
             for orig_path in part.exclude_path:
                 path = orig_path
                 if os.path.isabs(path):
-                    msger.error("Must be relative: --exclude-path=%s" % orig_path)
+                    logger.error("Must be relative: --exclude-path=%s" % orig_path)
+                    sys.exit(1)
 
                 full_path = os.path.realpath(os.path.join(new_rootfs, path))
 
@@ -106,7 +108,8 @@ class RootfsPlugin(SourcePlugin):
                 # because doing so could be quite disastrous (we will delete the
                 # directory).
                 if not full_path.startswith(new_rootfs):
-                    msger.error("'%s' points to a path outside the rootfs" % orig_path)
+                    logger.error("'%s' points to a path outside the rootfs" % orig_path)
+                    sys.exit(1)
 
                 if path.endswith(os.sep):
                     # Delete content only.


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