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

wic: raise WicError in wic plugins

Browse Source 
Replaced sys.exit with raising WicError in wic plugins.

(From OE-Core rev: 92e8c81c941597eb2b4b61d5c28833e4826888f8)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-02-14 23:07:35 +02:00
committed by Richard Purdie
parent f5ae79da40
commit 8da175607c
9 changed files with 75 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,10 @@
import logging
import os
import shutil
import sys
from oe.path import copyhardlinktree
from wic.errors import WicError
from wic.pluginbase import SourcePlugin
from wic.utils.misc import get_bitbake_var, exec_cmd
@@ -51,10 +51,9 @@ class RootfsPlugin(SourcePlugin):
image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir)
if not os.path.isdir(image_rootfs_dir):
logger.error("No valid artifact IMAGE_ROOTFS from image named %s "
"has been found at %s, exiting.\n",
rootfs_dir, image_rootfs_dir)
sys.exit(1)
raise WicError("No valid artifact IMAGE_ROOTFS from image "
"named %s has been found at %s, exiting." %
(rootfs_dir, image_rootfs_dir))
return image_rootfs_dir
@@ -69,8 +68,7 @@ class RootfsPlugin(SourcePlugin):
"""
if part.rootfs_dir is None:
if not 'ROOTFS_DIR' in krootfs_dir:
logger.error("Couldn't find --rootfs-dir, exiting")
sys.exit(1)
raise WicError("Couldn't find --rootfs-dir, exiting")
rootfs_dir = krootfs_dir['ROOTFS_DIR']
else:
@@ -79,9 +77,8 @@ class RootfsPlugin(SourcePlugin):
elif part.rootfs_dir:
rootfs_dir = part.rootfs_dir
else:
logger.error("Couldn't find --rootfs-dir=%s connection or "
"it is not a valid path, exiting", part.rootfs_dir)
sys.exit(1)
raise WicError("Couldn't find --rootfs-dir=%s connection or "
"it is not a valid path, exiting" % part.rootfs_dir)
real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)