summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2016-10-01 04:46:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-04 16:29:04 +0100
commit4359ef089566375ccc502f587cd3be670a2d67f0 (patch)
tree80f43ffb320e38496f700960870a88d99c7663e4 /meta
parent0c9ba38d929ebe5da2c2e0b2a605e6d12cc57266 (diff)
downloadpoky-4359ef089566375ccc502f587cd3be670a2d67f0.tar.gz
base.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: 9635af9785509a39c1ac2509740d46276119a0ca) Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 21957d84a1..024fe4331a 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -113,7 +113,7 @@ def get_lic_checksum_file_list(d):
113 continue 113 continue
114 filelist.append(path + ":" + str(os.path.exists(path))) 114 filelist.append(path + ":" + str(os.path.exists(path)))
115 except bb.fetch.MalformedUrl: 115 except bb.fetch.MalformedUrl:
116 raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url) 116 bb.fatal(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url)
117 return " ".join(filelist) 117 return " ".join(filelist)
118 118
119addtask fetch 119addtask fetch
@@ -131,7 +131,7 @@ python base_do_fetch() {
131 fetcher = bb.fetch2.Fetch(src_uri, d) 131 fetcher = bb.fetch2.Fetch(src_uri, d)
132 fetcher.download() 132 fetcher.download()
133 except bb.fetch2.BBFetchException as e: 133 except bb.fetch2.BBFetchException as e:
134 raise bb.build.FuncFailed(e) 134 bb.fatal(str(e))
135} 135}
136 136
137addtask unpack after do_fetch 137addtask unpack after do_fetch
@@ -152,7 +152,7 @@ python base_do_unpack() {
152 fetcher = bb.fetch2.Fetch(src_uri, d) 152 fetcher = bb.fetch2.Fetch(src_uri, d)
153 fetcher.unpack(d.getVar('WORKDIR', True)) 153 fetcher.unpack(d.getVar('WORKDIR', True))
154 except bb.fetch2.BBFetchException as e: 154 except bb.fetch2.BBFetchException as e:
155 raise bb.build.FuncFailed(e) 155 bb.fatal(str(e))
156} 156}
157 157
158def pkgarch_mapping(d): 158def pkgarch_mapping(d):
@@ -671,7 +671,7 @@ python do_cleanall() {
671 fetcher = bb.fetch2.Fetch(src_uri, d) 671 fetcher = bb.fetch2.Fetch(src_uri, d)
672 fetcher.clean() 672 fetcher.clean()
673 except bb.fetch2.BBFetchException as e: 673 except bb.fetch2.BBFetchException as e:
674 raise bb.build.FuncFailed(e) 674 bb.fatal(str(e))
675} 675}
676do_cleanall[nostamp] = "1" 676do_cleanall[nostamp] = "1"
677 677