From 19a868e9ad12fb27a7f713685d12f3d310fd6961 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 14 Feb 2017 20:13:46 +0200 Subject: wic: use wic logger in wic source plugins Replaced msger with wic logger in wic source plugins. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/rawcopy.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'scripts/lib/wic/plugins/source/rawcopy.py') diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 4e42e3edea..c5c3be3c2e 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -15,13 +15,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +import logging import os +import sys -from wic import msger from wic.pluginbase import SourcePlugin from wic.utils.misc import exec_cmd, get_bitbake_var from wic.filemap import sparse_copy +logger = logging.getLogger('wic') + class RawCopyPlugin(SourcePlugin): """ Populate partition content from raw image file. @@ -59,13 +62,14 @@ class RawCopyPlugin(SourcePlugin): if not bootimg_dir: bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") if not bootimg_dir: - msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") + logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") + sys.exit(1) - msger.debug('Bootimg dir: %s' % bootimg_dir) + logger.debug('Bootimg dir: %s', bootimg_dir) if 'file' not in source_params: - msger.error("No file specified\n") - return + logger.error("No file specified\n") + sys.exit(1) src = os.path.join(bootimg_dir, source_params['file']) dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno)) -- cgit v1.2.3