diff options
author | Kristian Amlie <kristian.amlie@mender.io> | 2017-05-30 09:56:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-06 19:49:55 +0100 |
commit | b561292c4e7b5578172066f82b6518b5bda53f42 (patch) | |
tree | b7bc13882b6d5c094f6898abc2d2fd3f99fe067a /scripts/lib | |
parent | 986452c410a958e339f31f8c05461c18a1a15eb5 (diff) | |
download | openembedded-core-b561292c4e7b5578172066f82b6518b5bda53f42.tar.gz openembedded-core-b561292c4e7b5578172066f82b6518b5bda53f42.tar.bz2 openembedded-core-b561292c4e7b5578172066f82b6518b5bda53f42.zip |
wic: Remove obsolete reference to msger logger.
This was overlooked when msger was removed in 28014087b8091.
Signed-off-by: Kristian Amlie <kristian.amlie@mender.io>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | 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 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. |