mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: Remove obsolete reference to msger logger.

Browse Source 
This was overlooked when msger was removed in 28014087b8.

(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>
This commit is contained in:
Kristian Amlie
2017-05-30 09:56:59 +02:00
committed by Richard Purdie
parent 6dcbe84505
commit 1c8cfd074b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/wic/plugins/source/rootfs.py
View File

@@ -28,6 +28,7 @@
import logging import logging
import os import os
import shutil import shutil
import sys
from oe.path import copyhardlinktree from oe.path import copyhardlinktree
@@ -98,7 +99,8 @@ class RootfsPlugin(SourcePlugin):
for orig_path in part.exclude_path: for orig_path in part.exclude_path:
path = orig_path path = orig_path
if os.path.isabs(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)) 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 # because doing so could be quite disastrous (we will delete the
# directory). # directory).
if not full_path.startswith(new_rootfs): 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): if path.endswith(os.sep):
# Delete content only. # Delete content only.