From 51c3e9df28619bfa5a6c22a7c91c7c7093080c87 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 8 May 2013 05:06:46 -0400 Subject: bbclass: bb.fatal() clean up The bb.fatal() is defined as: def fatal(*args): logger.critical(''.join(args)) sys.exit(1) So anything after bb.fatal() in the same code block doesn't have any effect, e.g.: bb.fatal("%s_%s: %s" % (var, pkg, e)) raise e The "raise e" should be removed. I searched all the files which use bb.fatal(), only the following 3 classes have this issues: insane.bbclass package.bbclass package_rpm.bbclass [YOCTO #4461] (From OE-Core rev: 4c47525c5a171b1282615c9fbc7d84addef85f92) Signed-off-by: Robert Yang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 1 - meta/classes/package.bbclass | 1 - meta/classes/package_rpm.bbclass | 2 -- 3 files changed, 4 deletions(-) (limited to 'meta') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index fb1802223a..3ed5581949 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -718,7 +718,6 @@ def package_qa_check_deps(pkg, pkgdest, skip, d): rvar = bb.utils.explode_dep_versions2(localdata.getVar(var, True) or "") except ValueError as e: bb.fatal("%s_%s: %s" % (var, pkg, e)) - raise e for dep in rvar: for v in rvar[dep]: if v and not v.startswith(('< ', '= ', '> ', '<= ', '>=')): diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 0f2743d106..02a1460624 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -372,7 +372,6 @@ python package_get_auto_pr() { auto_pr=prserv_get_pr_auto(d) except Exception as e: bb.fatal("Can NOT get PRAUTO, exception %s" % str(e)) - return if auto_pr is None: if d.getVar('PRSERV_LOCKDOWN', True): bb.fatal("Can NOT get PRAUTO from lockdown exported file") diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 25b14dd79d..8935c9fc6a 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -672,12 +672,10 @@ python write_specfile () { pkgdest = d.getVar('PKGDEST', True) if not pkgdest: bb.fatal("No PKGDEST") - return outspecfile = d.getVar('OUTSPECFILE', True) if not outspecfile: bb.fatal("No OUTSPECFILE") - return # Construct the SPEC file... srcname = strip_multilib(d.getVar('PN', True), d) -- cgit v1.2.3-54-g00ecf