]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: Remove obsolete reference to msger logger.
authorKristian Amlie <kristian.amlie@mender.io>
Tue, 30 May 2017 07:56:59 +0000 (09:56 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 6 Jun 2017 18:49:55 +0000 (19:49 +0100)
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>
scripts/lib/wic/plugins/source/rootfs.py

index f2e2ca8a2be1a842033e820a01b98adbe0ec77a0..944ec5f45562197df7840001cd33969893381a53 100644 (file)
@@ -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.