From c7d522c71747ebb3382db9bc609125faaa79c844 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Sat, 1 Oct 2016 04:46:52 +0200 Subject: package_deb.bbclass: Use bb.fatal() instead of raising FuncFailed This sets a good example and avoids unnecessarily contributing to perceived complexity and cargo culting. Motivating quote below: < kergoth> the *original* intent was for the function/task to error via whatever appropriate means, bb.fatal, whatever, and funcfailed was what you'd catch if you were calling exec_func/exec_task. that is, it's what those functions raise, not what metadata functions should be raising < kergoth> it didn't end up being used that way < kergoth> but there's really never a reason to raise it yourself FuncFailed.__init__ takes a 'name' argument rather than a 'msg' argument, which also shows that the original purpose got lost. (From OE-Core rev: 5a074e8a26d27ea9c4f31e2b75b2b14f6e0641d3) Signed-off-by: Ulf Magnusson Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4e5dc12850..fb6034cab1 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -126,7 +126,7 @@ python do_package_deb () { ctrlfile = codecs.open(os.path.join(controldir, 'control'), 'w', 'utf-8') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open control file for writing.") + bb.fatal("unable to open control file for writing") fields = [] pe = d.getVar('PKGE', True) @@ -197,7 +197,7 @@ python do_package_deb () { (type, value, traceback) = sys.exc_info() bb.utils.unlockfile(lf) ctrlfile.close() - raise bb.build.FuncFailed("Missing field for deb generation: %s" % value) + bb.fatal("Missing field for deb generation: %s" % value) # more fields @@ -277,7 +277,7 @@ python do_package_deb () { scriptfile = open(os.path.join(controldir, script), 'w') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open %s script file for writing." % script) + bb.fatal("unable to open %s script file for writing" % script) if scriptvar.startswith("#!"): pos = scriptvar.find("\n") + 1 @@ -301,7 +301,7 @@ python do_package_deb () { conffiles = open(os.path.join(controldir, 'conffiles'), 'w') except OSError: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("unable to open conffiles for writing.") + bb.fatal("unable to open conffiles for writing") for f in conffiles_str.split(): if os.path.exists(oe.path.join(root, f)): conffiles.write('%s\n' % f) @@ -311,7 +311,7 @@ python do_package_deb () { ret = subprocess.call("PATH=\"%s\" dpkg-deb -b %s %s" % (localdata.getVar("PATH", True), root, pkgoutdir), shell=True) if ret != 0: bb.utils.unlockfile(lf) - raise bb.build.FuncFailed("dpkg-deb execution failed") + bb.fatal("dpkg-deb execution failed") cleanupcontrol(root) bb.utils.unlockfile(lf) -- cgit v1.2.3-54-g00ecf