From b561292c4e7b5578172066f82b6518b5bda53f42 Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Tue, 30 May 2017 09:56:59 +0200 Subject: wic: Remove obsolete reference to msger logger. This was overlooked when msger was removed in 28014087b8091. Signed-off-by: Kristian Amlie Signed-off-by: Ross Burton --- scripts/lib/wic/plugins/source/rootfs.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index f2e2ca8a2b..944ec5f455 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. -- cgit 1.2.3-korg