From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6795053263826714624 Date: Tue, 18 Feb 2020 23:38:23 -0800 (PST) From: vijai kumar To: isar-users Message-Id: <2e0645f0-c397-48c0-b741-988f16a05384@googlegroups.com> In-Reply-To: <94d92943-ea75-bda6-1b07-56440856eb14@siemens.com> References: <94d92943-ea75-bda6-1b07-56440856eb14@siemens.com> Subject: Re: [PATCH] meta: Replace no longer available bb.build.FuncFailed MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_4375_1438527367.1582097904107" X-Google-Token: EO_Ls_IFNDtug1L8r6k0 X-Google-IP: 139.181.36.34 X-TUID: klV6mK3Fg5Qv ------=_Part_4375_1438527367.1582097904107 Content-Type: multipart/alternative; boundary="----=_Part_4376_1529466066.1582097904107" ------=_Part_4376_1529466066.1582097904107 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit My patch[1] exactly addresses this :) [1] https://groups.google.com/forum/#!topic/isar-users/ZAAKFICAbLA Thanks, Vijai Kumar K On Wednesday, February 19, 2020 at 12:47:05 PM UTC+5:30, Jan Kiszka wrote: > > From: Jan Kiszka > > > Follow the pattern in oe-core and issue bb.fatal instead. > > Signed-off-by: Jan Kiszka > > --- > meta/classes/base.bbclass | 4 ++-- > meta/classes/dpkg-base.bbclass | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index e233164c..b7de921a 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -171,7 +171,7 @@ python do_fetch() { > fetcher = bb.fetch2.Fetch(src_uri, d) > fetcher.download() > except bb.fetch2.BBFetchException as e: > - raise bb.build.FuncFailed(e) > + bb.fatal(str(e)) > } > > addtask fetch before do_build > @@ -190,7 +190,7 @@ python do_unpack() { > fetcher = bb.fetch2.Fetch(src_uri, d) > fetcher.unpack(rootdir) > except bb.fetch2.BBFetchException as e: > - raise bb.build.FuncFailed(e) > + bb.fatal(str(e)) > } > > addtask unpack after do_fetch before do_build > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass > index 1decf587..5d2c161c 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -42,7 +42,7 @@ python do_adjust_git() { > if subprocess.call(cmd) != 0: > bb.fatal("git alternates adjustment failed") > except bb.fetch2.BBFetchException as e: > - raise bb.build.FuncFailed(e) > + bb.fatal(str(e)) > } > > addtask adjust_git after do_unpack before do_patch > -- > 2.16.4 > > > -- > Siemens AG, Corporate Technology, CT RDA IOT SES-DE > Corporate Competence Center Embedded Linux > ------=_Part_4376_1529466066.1582097904107 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
My patch[1] exactly addresses this :)

<= /div>
[1] https://groups.google.com/forum/#!topic/isar-users/ZAAKFICAbL= A

Thanks,
Vijai Kumar K

On = Wednesday, February 19, 2020 at 12:47:05 PM UTC+5:30, Jan Kiszka wrote:From: Jan Kiszka <jan....@siemens.co= m>

Follow the pattern in oe-core and issue bb.fatal instead.

Signed-off-by: Jan Kiszka <jan....@siemens.com>
---
=C2=A0meta/classes/base.bbclass =C2=A0 =C2=A0 =C2=A0| 4 ++--
=C2=A0meta/classes/dpkg-base.bbclass | 2 +-
=C2=A02 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e233164c..b7de921a 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -171,7 +171,7 @@ python do_fetch() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher =3D bb.fetch2.Fetch(src_uri, = d)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher.download()
=C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as e:
- =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
=C2=A0}
=C2=A0
=C2=A0addtask fetch before do_build
@@ -190,7 +190,7 @@ python do_unpack() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher =3D bb.fetch2.Fetch(src_uri, = d)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher.unpack(rootdir)
=C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as e:
- =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
=C2=A0}
=C2=A0
=C2=A0addtask unpack after do_fetch before do_build
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-ba= se.bbclass
index 1decf587..5d2c161c 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -42,7 +42,7 @@ python do_adjust_git() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if subpro= cess.call(cmd) !=3D 0:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0bb.fatal("git alternates adjustment failed")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as = e:
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
=C2=A0}
=C2=A0
=C2=A0addtask adjust_git after do_unpack before do_patch
--=20
2.16.4


--=20
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
------=_Part_4376_1529466066.1582097904107-- ------=_Part_4375_1438527367.1582097904107--