Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed

["Gao, Liming" <liming.gao@intel.com>]

This is a bug. I agree to fix it for Q1 stable tag. 

> -----Original Message-----
> From: Feng, Bob C
> Sent: Monday, March 4, 2019 5:02 PM
> To: Gao, Liming <liming.gao@intel.com>; Fan, ZhijuX <zhijux.fan@intel.com>; edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>
> Subject: RE: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
> 
> Hi,
> 
> This patch is to fix the a regression issue introduced by python3 patch set. I'd like to push this patch for Q1 stable tag.
> Would you approve it?
> 
> Thanks,
> Bob
> 
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Feng, Bob C
> Sent: Monday, March 4, 2019 3:30 PM
> To: Fan, ZhijuX <zhijux.fan@intel.com>; edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: Re: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
> 
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
> 
> 
> -----Original Message-----
> From: Fan, ZhijuX
> Sent: Friday, March 1, 2019 10:52 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [edk2][PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
> 
> The reason for this problem is that the file was opened incorrectly.
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
> ---
>  .../plugins/EdkPlugins/edk2/model/doxygengen.py                    | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
> index e31df262bc..73349e2f48 100644
> --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
> +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
> @@ -376,9 +376,10 @@ class PackageDocumentAction(DoxygenAction):
>              return
> 
>          try:
> -            f = open(path, 'r')
> -            lines = f.readlines()
> -            f.close()
> +            with open(path, 'r') as f:
> +                lines = f.readlines()
> +        except UnicodeDecodeError:
> +            return
>          except IOError:
>              ErrorMsg('Fail to open file %s' % path)
>              return
> --
> 2.14.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel