From 346ef9245db8423796cb3e0675ea82fd973d80f1 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 27 May 2015 14:05:20 +0300 Subject: wic: refactored processing of wic exceptions All wic exceptions are now inherited from new base exception class WicError. It makes them easy to maintain and catch. Processing of exceptions is done this way: Known wic exceptions cause wic to print error message to stdout. Unknown exceptions are not catched anymore and produce standard python traceback. (From OE-Core rev: e5e2c18ce4344c14d9e52ece916333bd0a619281) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/utils/errors.py | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) (limited to 'scripts/lib/wic/utils/errors.py') diff --git a/scripts/lib/wic/utils/errors.py b/scripts/lib/wic/utils/errors.py index 9410311875..d1b514dd9d 100644 --- a/scripts/lib/wic/utils/errors.py +++ b/scripts/lib/wic/utils/errors.py @@ -16,32 +16,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston, MA 02111-1307, USA. -class CreatorError(Exception): - """An exception base class for all imgcreate errors.""" - keyword = '' +class WicError(Exception): + pass - def __init__(self, msg): - self.msg = msg +class CreatorError(WicError): + pass - def __str__(self): - if isinstance(self.msg, unicode): - self.msg = self.msg.encode('utf-8', 'ignore') - else: - self.msg = str(self.msg) - return self.keyword + self.msg +class Usage(WicError): + pass -class Usage(CreatorError): - keyword = '' - - def __str__(self): - if isinstance(self.msg, unicode): - self.msg = self.msg.encode('utf-8', 'ignore') - else: - self.msg = str(self.msg) - return self.keyword + self.msg + ', please use "--help" for more info' - -class KsError(CreatorError): - keyword = '' - -class ImageError(CreatorError): - keyword = '' +class ImageError(WicError): + pass -- cgit v1.2.3-54-g00ecf