From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 6785572557105922048
Date: Mon, 17 Feb 2020 22:06:50 -0800 (PST)
From: vijai kumar <vijaikumar.kanagarajan@gmail.com>
To: isar-users <isar-users@googlegroups.com>
Message-Id: <77c2f89d-70cc-44c4-bc8e-f4df88ef71a5@googlegroups.com>
In-Reply-To: <20200124180638.2395-1-Vijaikumar_Kanagarajan@mentor.com>
References: <20200124180638.2395-1-Vijaikumar_Kanagarajan@mentor.com>
Subject: Re: [PATCH] meta/classes: Replace obselete FuncFailed
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_4655_1867565705.1582006010542"
X-Google-Token: EPr9rfIFPEeV7CYnfeU0
X-Google-IP: 139.181.36.34
X-TUID: U+Zp7q8bmGBy

------=_Part_4655_1867565705.1582006010542
Content-Type: multipart/alternative; 
	boundary="----=_Part_4656_446258267.1582006010542"

------=_Part_4656_446258267.1582006010542
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Can this be merged?

Thanks,
Vijai Kumar K

On Friday, January 24, 2020 at 11:37:06 PM UTC+5:30, vijai kumar wrote:
>
> bb.build.FuncFailed is dropped from bitbake v1.43.1 onwards. 
> Replace the now obselete FuncFailed with bb.fatal. 
>
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> 
> --- 
>  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 e233164..b7de921 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 af9c984..0589bf5 100644 
> --- a/meta/classes/dpkg-base.bbclass 
> +++ b/meta/classes/dpkg-base.bbclass 
> @@ -40,7 +40,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.17.1 
>
>
------=_Part_4656_446258267.1582006010542
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Can this be merged?</div><div><br></div><div>Thanks,<=
/div><div>Vijai Kumar K<br></div><br>On Friday, January 24, 2020 at 11:37:0=
6 PM UTC+5:30, vijai kumar wrote:<blockquote class=3D"gmail_quote" style=3D=
"margin: 0;margin-left: 0.8ex;border-left: 1px #ccc solid;padding-left: 1ex=
;">bb.build.FuncFailed is dropped from bitbake v1.43.1 onwards.
<br>Replace the now obselete FuncFailed with bb.fatal.
<br>
<br>Signed-off-by: Vijai Kumar K &lt;<a href=3D"mailto:Vijaikumar_Kanagaraj=
an@mentor.com" target=3D"_blank" rel=3D"nofollow" onmousedown=3D"this.href=
=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return true;" onclick=
=3D"this.href=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return t=
rue;">Vijaikumar_Kanagarajan@<wbr>mentor.com</a>&gt;
<br>---
<br>=C2=A0meta/classes/base.bbclass =C2=A0 =C2=A0 =C2=A0| 4 ++--
<br>=C2=A0meta/classes/dpkg-base.<wbr>bbclass | 2 +-
<br>=C2=A02 files changed, 3 insertions(+), 3 deletions(-)
<br>
<br>diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
<br>index e233164..b7de921 100644
<br>--- a/meta/classes/base.bbclass
<br>+++ b/meta/classes/base.bbclass
<br>@@ -171,7 +171,7 @@ python do_fetch() {
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher =3D bb.fetch2.Fetch(src_uri, =
d)
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher.download()
<br>=C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as e:
<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
<br>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
<br>=C2=A0}
<br>=C2=A0
<br>=C2=A0addtask fetch before do_build
<br>@@ -190,7 +190,7 @@ python do_unpack() {
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher =3D bb.fetch2.Fetch(src_uri, =
d)
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fetcher.unpack(rootdir)
<br>=C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as e:
<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
<br>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
<br>=C2=A0}
<br>=C2=A0
<br>=C2=A0addtask unpack after do_fetch before do_build
<br>diff --git a/meta/classes/dpkg-base.<wbr>bbclass b/meta/classes/dpkg-ba=
se.<wbr>bbclass
<br>index af9c984..0589bf5 100644
<br>--- a/meta/classes/dpkg-base.<wbr>bbclass
<br>+++ b/meta/classes/dpkg-base.<wbr>bbclass
<br>@@ -40,7 +40,7 @@ python do_adjust_git() {
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if subpro=
cess.call(cmd) !=3D 0:
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0bb.fatal(&quot;git alternates adjustment failed&quot;)
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0except bb.fetch2.BBFetchException as =
e:
<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise bb.build.FuncFailed(e)
<br>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bb.fatal(str(e))
<br>=C2=A0}
<br>=C2=A0
<br>=C2=A0addtask adjust_git after do_unpack before do_patch
<br>--=20
<br>2.17.1
<br>
<br></blockquote></div>
------=_Part_4656_446258267.1582006010542--

------=_Part_4655_1867565705.1582006010542--