[OE-core] [PATCH] wic: Remove obsolete reference to msger logger.
Kristian Amlie
kristian.amlie at mender.io
Tue May 30 07:56:59 UTC 2017
This was overlooked when msger was removed in 28014087b8091.
Signed-off-by: Kristian Amlie <kristian.amlie at mender.io>
---
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 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.
--
2.7.4
More information about the Openembedded-core
mailing list