summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/fsimage.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-14 20:13:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 10:42:29 +0000
commit19a868e9ad12fb27a7f713685d12f3d310fd6961 (patch)
tree388f7140b74c5d63c41e2c4595fbb9cd445b90fd /scripts/lib/wic/plugins/source/fsimage.py
parentadeacb4e600b8438bd9db7e83a5cb4a118d186f3 (diff)
downloadopenembedded-core-19a868e9ad12fb27a7f713685d12f3d310fd6961.tar.gz
wic: use wic logger in wic source plugins
Replaced msger with wic logger in wic source plugins. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/plugins/source/fsimage.py')
-rw-r--r--scripts/lib/wic/plugins/source/fsimage.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py
index 9193892ae1..35fb78b832 100644
--- a/scripts/lib/wic/plugins/source/fsimage.py
+++ b/scripts/lib/wic/plugins/source/fsimage.py
@@ -15,12 +15,15 @@
# 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 get_bitbake_var
+logger = logging.getLogger('wic')
+
class FSImagePlugin(SourcePlugin):
"""
Add an already existing filesystem image to the partition layout.
@@ -58,16 +61,17 @@ class FSImagePlugin(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'])
- msger.debug('Preparing partition using image %s' % (src))
+ logger.debug('Preparing partition using image %s', src)
part.prepare_rootfs_from_fs_image(cr_workdir, src, "")