summaryrefslogtreecommitdiffstats
path: root/meta/classes/systemd-boot.bbclass
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2016-10-01 02:46:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-04 15:29:04 (GMT)
commitd11b51dfadf2a5cadcbfa3ee384776aba291ed9a (patch)
tree4a0101936fe60f2d7bf2f9285b711a92076c639a /meta/classes/systemd-boot.bbclass
parent46398106efceba33715f9e6910b965629306fbdc (diff)
downloadpoky-d11b51dfadf2a5cadcbfa3ee384776aba291ed9a.tar.gz
systemd-boot.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: c61d7a01c89f0d25d069191cc47d6768bee2ce48) Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/systemd-boot.bbclass')
-rw-r--r--meta/classes/systemd-boot.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass
index b550b61..05244c7 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -77,7 +77,7 @@ python build_efi_cfg() {
77 try: 77 try:
78 cfgfile = open(cfile, 'w') 78 cfgfile = open(cfile, 'w')
79 except OSError: 79 except OSError:
80 raise bb.build.FuncFailed('Unable to open %s' % (cfile)) 80 bb.fatal('Unable to open %s' % cfile)
81 81
82 cfgfile.write('# Automatically created by OE\n') 82 cfgfile.write('# Automatically created by OE\n')
83 cfgfile.write('default %s\n' % (labels.split()[0])) 83 cfgfile.write('default %s\n' % (labels.split()[0]))
@@ -93,14 +93,14 @@ python build_efi_cfg() {
93 93
94 overrides = localdata.getVar('OVERRIDES', True) 94 overrides = localdata.getVar('OVERRIDES', True)
95 if not overrides: 95 if not overrides:
96 raise bb.build.FuncFailed('OVERRIDES not defined') 96 bb.fatal('OVERRIDES not defined')
97 97
98 entryfile = "%s/%s.conf" % (s, label) 98 entryfile = "%s/%s.conf" % (s, label)
99 d.appendVar("SYSTEMD_BOOT_ENTRIES", " " + entryfile) 99 d.appendVar("SYSTEMD_BOOT_ENTRIES", " " + entryfile)
100 try: 100 try:
101 entrycfg = open(entryfile, "w") 101 entrycfg = open(entryfile, "w")
102 except OSError: 102 except OSError:
103 raise bb.build.FuncFailed('Unable to open %s' % (entryfile)) 103 bb.fatal('Unable to open %s' % entryfile)
104 localdata.setVar('OVERRIDES', label + ':' + overrides) 104 localdata.setVar('OVERRIDES', label + ':' + overrides)
105 bb.data.update_data(localdata) 105 bb.data.update_data(localdata)
106 106