[edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[Ashraf Ali S]

When the FMMTConf.ini file has empty lines then it used to throw errors
GuidTool load error!, this patch is to skip checking for empty lines in
the ini file

Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Chen Christine <yuwei.chen@intel.com>
Cc: Chaganty Rangasai V <rangasai.v.chaganty@intel.com>

Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
---
 BaseTools/Source/Python/FMMT/core/GuidTools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/FMMT/core/GuidTools.py b/BaseTools/Source/Python/FMMT/core/GuidTools.py
index f6bdeffa50..f9cfd4ead0 100644
--- a/BaseTools/Source/Python/FMMT/core/GuidTools.py
+++ b/BaseTools/Source/Python/FMMT/core/GuidTools.py
@@ -153,7 +153,7 @@ class GUIDTools:
                 config_data = fd.readlines()
             for line in config_data:
                 try:
-                    if not line.startswith("#"):
+                    if not line.startswith("#") and line.strip():
                         guid, short_name, command = line.split()
                         new_format_guid = struct2stream(ModifyGuidFormat(guid.strip()))
                         self.tooldef[new_format_guid] = GUIDTool(
-- 
2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116110): https://edk2.groups.io/g/devel/message/116110
Mute This Topic: https://groups.io/mt/104620514/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[Yuwei Chen]

Ali, please also create PR in BaseTools repo.
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Wednesday, February 28, 2024 5:57 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Rebecca Cran
> <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob
> C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH] BaseTools: FMMT Skip empty Lines while parsing
> FMMTConfig.ini
> 
> When the FMMTConf.ini file has empty lines then it used to throw errors
> GuidTool load error!, this patch is to skip checking for empty lines in the ini
> file
> 
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Chen Christine <yuwei.chen@intel.com>
> Cc: Chaganty Rangasai V <rangasai.v.chaganty@intel.com>
> 
> Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
> ---
>  BaseTools/Source/Python/FMMT/core/GuidTools.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> index f6bdeffa50..f9cfd4ead0 100644
> --- a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> +++ b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> @@ -153,7 +153,7 @@ class GUIDTools:
>                  config_data = fd.readlines()
>              for line in config_data:
>                  try:
> -                    if not line.startswith("#"):
> +                    if not line.startswith("#") and line.strip():
>                          guid, short_name, command = line.split()
>                          new_format_guid =
> struct2stream(ModifyGuidFormat(guid.strip()))
>                          self.tooldef[new_format_guid] = GUIDTool(
> --
> 2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116582): https://edk2.groups.io/g/devel/message/116582
Mute This Topic: https://groups.io/mt/104620514/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[Ashraf Ali S]

Thanks for the review.

I have triggered the PR under basetools : https://github.com/tianocore/edk2-basetools/pull/122

Thanks.,
S, Ashraf Ali

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei Chen
Sent: Monday, March 11, 2024 1:22 PM
To: S, Ashraf Ali <ashraf.ali.s@intel.com>; devel@edk2.groups.io
Cc: Rebecca Cran <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

Ali, please also create PR in BaseTools repo.
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Wednesday, February 28, 2024 5:57 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Rebecca Cran 
> <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob 
> C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>; 
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH] BaseTools: FMMT Skip empty Lines while parsing 
> FMMTConfig.ini
> 
> When the FMMTConf.ini file has empty lines then it used to throw 
> errors GuidTool load error!, this patch is to skip checking for empty 
> lines in the ini file
> 
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Chen Christine <yuwei.chen@intel.com>
> Cc: Chaganty Rangasai V <rangasai.v.chaganty@intel.com>
> 
> Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
> ---
>  BaseTools/Source/Python/FMMT/core/GuidTools.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> index f6bdeffa50..f9cfd4ead0 100644
> --- a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> +++ b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> @@ -153,7 +153,7 @@ class GUIDTools:
>                  config_data = fd.readlines()
>              for line in config_data:
>                  try:
> -                    if not line.startswith("#"):
> +                    if not line.startswith("#") and line.strip():
>                          guid, short_name, command = line.split()
>                          new_format_guid =
> struct2stream(ModifyGuidFormat(guid.strip()))
>                          self.tooldef[new_format_guid] = GUIDTool(
> --
> 2.42.0.windows.2








-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116611): https://edk2.groups.io/g/devel/message/116611
Mute This Topic: https://groups.io/mt/104620514/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[Ashraf Ali S]

Hi @Liming Gao @Rebecca Cran

Is this patch already pushed? As its been already reviewed.

Thanks.,
S, Ashraf Ali

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashraf Ali S
Sent: Monday, March 11, 2024 5:01 PM
To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

Thanks for the review.

I have triggered the PR under basetools : https://github.com/tianocore/edk2-basetools/pull/122

Thanks.,
S, Ashraf Ali

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei Chen
Sent: Monday, March 11, 2024 1:22 PM
To: S, Ashraf Ali <ashraf.ali.s@intel.com>; devel@edk2.groups.io
Cc: Rebecca Cran <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

Ali, please also create PR in BaseTools repo.
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Wednesday, February 28, 2024 5:57 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Rebecca Cran 
> <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng, Bob 
> C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>; 
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH] BaseTools: FMMT Skip empty Lines while parsing 
> FMMTConfig.ini
> 
> When the FMMTConf.ini file has empty lines then it used to throw 
> errors GuidTool load error!, this patch is to skip checking for empty 
> lines in the ini file
> 
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Chen Christine <yuwei.chen@intel.com>
> Cc: Chaganty Rangasai V <rangasai.v.chaganty@intel.com>
> 
> Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
> ---
>  BaseTools/Source/Python/FMMT/core/GuidTools.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> index f6bdeffa50..f9cfd4ead0 100644
> --- a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> +++ b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> @@ -153,7 +153,7 @@ class GUIDTools:
>                  config_data = fd.readlines()
>              for line in config_data:
>                  try:
> -                    if not line.startswith("#"):
> +                    if not line.startswith("#") and line.strip():
>                          guid, short_name, command = line.split()
>                          new_format_guid =
> struct2stream(ModifyGuidFormat(guid.strip()))
>                          self.tooldef[new_format_guid] = GUIDTool(
> --
> 2.42.0.windows.2













-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117910): https://edk2.groups.io/g/devel/message/117910
Mute This Topic: https://groups.io/mt/104620514/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while parsing FMMTConfig.ini

[gaoliming via groups.io]

Ashraf:
  I just merge it. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ashraf Ali S
> 发送时间: 2024年4月17日 16:36
> 收件人: devel@edk2.groups.io; S, Ashraf Ali <ashraf.ali.s@intel.com>;
Chen,
> Christine <yuwei.chen@intel.com>; Rebecca Cran <rebecca@bsdio.com>;
> Liming Gao <gaoliming@byosoft.com.cn>
> 抄送: Feng, Bob C <bob.c.feng@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> 主题: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while
> parsing FMMTConfig.ini
> 
> Hi @Liming Gao @Rebecca Cran
> 
> Is this patch already pushed? As its been already reviewed.
> 
> Thanks.,
> S, Ashraf Ali
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashraf Ali
> S
> Sent: Monday, March 11, 2024 5:01 PM
> To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while
> parsing FMMTConfig.ini
> 
> Thanks for the review.
> 
> I have triggered the PR under basetools :
> https://github.com/tianocore/edk2-basetools/pull/122
> 
> Thanks.,
> S, Ashraf Ali
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei
> Chen
> Sent: Monday, March 11, 2024 1:22 PM
> To: S, Ashraf Ali <ashraf.ali.s@intel.com>; devel@edk2.groups.io
> Cc: Rebecca Cran <rebecca@bsdio.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: Re: [edk2-devel] [PATCH] BaseTools: FMMT Skip empty Lines while
> parsing FMMTConfig.ini
> 
> Ali, please also create PR in BaseTools repo.
> Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
> 
> > -----Original Message-----
> > From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> > Sent: Wednesday, February 28, 2024 5:57 PM
> > To: devel@edk2.groups.io
> > Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Rebecca Cran
> > <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Feng,
> Bob
> > C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>;
> > Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> > Subject: [PATCH] BaseTools: FMMT Skip empty Lines while parsing
> > FMMTConfig.ini
> >
> > When the FMMTConf.ini file has empty lines then it used to throw
> > errors GuidTool load error!, this patch is to skip checking for empty
> > lines in the ini file
> >
> > Cc: Rebecca Cran <rebecca@bsdio.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Bob Feng <bob.c.feng@intel.com>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > Cc: Chen Christine <yuwei.chen@intel.com>
> > Cc: Chaganty Rangasai V <rangasai.v.chaganty@intel.com>
> >
> > Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
> > ---
> >  BaseTools/Source/Python/FMMT/core/GuidTools.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> > b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> > index f6bdeffa50..f9cfd4ead0 100644
> > --- a/BaseTools/Source/Python/FMMT/core/GuidTools.py
> > +++ b/BaseTools/Source/Python/FMMT/core/GuidTools.py
> > @@ -153,7 +153,7 @@ class GUIDTools:
> >                  config_data = fd.readlines()
> >              for line in config_data:
> >                  try:
> > -                    if not line.startswith("#"):
> > +                    if not line.startswith("#") and line.strip():
> >                          guid, short_name, command = line.split()
> >                          new_format_guid =
> > struct2stream(ModifyGuidFormat(guid.strip()))
> >                          self.tooldef[new_format_guid] = GUIDTool(
> > --
> > 2.42.0.windows.2
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117918): https://edk2.groups.io/g/devel/message/117918
Mute This Topic: https://groups.io/mt/105575993/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-