[oe-commits] Robert Yang : bbclass: bb.fatal() clean up
git at git.openembedded.org
git at git.openembedded.org
Wed May 15 21:05:04 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 4c47525c5a171b1282615c9fbc7d84addef85f92
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4c47525c5a171b1282615c9fbc7d84addef85f92
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Wed May 8 05:06:46 2013 -0400
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]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/insane.bbclass | 1 -
meta/classes/package.bbclass | 1 -
meta/classes/package_rpm.bbclass | 2 --
3 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index fb18022..3ed5581 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 0f2743d..02a1460 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 25b14dd..8935c9f 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)
More information about the Openembedded-commits
mailing list