[Patch] BaseTools: Fixed a typo in Trim.py

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [Patch] BaseTools: Fixed a typo in Trim.py
@ 2019-08-01 13:23 Bob Feng
  2019-08-01 14:44 ` [edk2-devel] " Carsey, Jaben
  2019-08-01 16:10 ` Philippe Mathieu-Daudé
  0 siblings, 2 replies; 5+ messages in thread
From: Bob Feng @ 2019-08-01 13:23 UTC (permalink / raw)
  To: devel; +Cc: Liming Gao, Bob Feng

This is a regression issue introduced
by commit 307e1650be267b67db7be1089e0979ace460d83

This patch is to fix this issue.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Trim/Trim.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 8767b67f7e..24c3fafa76 100644
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
     try:
         with open(Source, "r") as File:
             Lines = File.readlines()
     except IOError:
         EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)
-    expect:
+    except:
         EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error while processing file", File=Source)
 
     PreprocessedFile = ""
     InjectedFile = ""
     LineIndexOfOriginalFile = None
-- 
2.18.0.windows.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
  2019-08-01 13:23 [Patch] BaseTools: Fixed a typo in Trim.py Bob Feng
@ 2019-08-01 14:44 ` Carsey, Jaben
  2019-08-01 16:13   ` Liming Gao
       [not found]   ` <15B6D88ADF05C073.3315@groups.io>
  2019-08-01 16:10 ` Philippe Mathieu-Daudé
  1 sibling, 2 replies; 5+ messages in thread
From: Carsey, Jaben @ 2019-08-01 14:44 UTC (permalink / raw)
  To: devel@edk2.groups.io, Feng, Bob C; +Cc: Gao, Liming

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

Thanks
-Jaben


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Bob Feng
> Sent: Thursday, August 01, 2019 6:24 AM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C
> <bob.c.feng@intel.com>
> Subject: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> 
> This is a regression issue introduced
> by commit 307e1650be267b67db7be1089e0979ace460d83
> 
> This patch is to fix this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/Trim/Trim.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/Trim/Trim.py
> b/BaseTools/Source/Python/Trim/Trim.py
> index 8767b67f7e..24c3fafa76 100644
> --- a/BaseTools/Source/Python/Trim/Trim.py
> +++ b/BaseTools/Source/Python/Trim/Trim.py
> @@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target,
> ConvertHex, TrimLong):
>      try:
>          with open(Source, "r") as File:
>              Lines = File.readlines()
>      except IOError:
>          EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)
> -    expect:
> +    except:
>          EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error
> while processing file", File=Source)
> 
>      PreprocessedFile = ""
>      InjectedFile = ""
>      LineIndexOfOriginalFile = None
> --
> 2.18.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
  2019-08-01 14:44 ` [edk2-devel] " Carsey, Jaben
@ 2019-08-01 16:13   ` Liming Gao
       [not found]   ` <15B6D88ADF05C073.3315@groups.io>
  1 sibling, 0 replies; 5+ messages in thread
From: Liming Gao @ 2019-08-01 16:13 UTC (permalink / raw)
  To: Carsey, Jaben, devel@edk2.groups.io, Feng, Bob C

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Carsey, Jaben
> Sent: Thursday, August 1, 2019 10:45 PM
> To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: RE: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> 
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> 
> Thanks
> -Jaben
> 
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Bob Feng
> > Sent: Thursday, August 01, 2019 6:24 AM
> > To: devel@edk2.groups.io
> > Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C
> > <bob.c.feng@intel.com>
> > Subject: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> >
> > This is a regression issue introduced
> > by commit 307e1650be267b67db7be1089e0979ace460d83
> >
> > This patch is to fix this issue.
> >
> > Cc: Liming Gao <liming.gao@intel.com>
> > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > ---
> >  BaseTools/Source/Python/Trim/Trim.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/BaseTools/Source/Python/Trim/Trim.py
> > b/BaseTools/Source/Python/Trim/Trim.py
> > index 8767b67f7e..24c3fafa76 100644
> > --- a/BaseTools/Source/Python/Trim/Trim.py
> > +++ b/BaseTools/Source/Python/Trim/Trim.py
> > @@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target,
> > ConvertHex, TrimLong):
> >      try:
> >          with open(Source, "r") as File:
> >              Lines = File.readlines()
> >      except IOError:
> >          EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)
> > -    expect:
> > +    except:
> >          EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error
> > while processing file", File=Source)
> >
> >      PreprocessedFile = ""
> >      InjectedFile = ""
> >      LineIndexOfOriginalFile = None
> > --
> > 2.18.0.windows.1
> >
> >
> > 


^ permalink raw reply	[flat|nested] 5+ messages in thread

[parent not found: <15B6D88ADF05C073.3315@groups.io>]

* Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
       [not found]   ` <15B6D88ADF05C073.3315@groups.io>
@ 2019-08-01 16:26     ` Liming Gao
  0 siblings, 0 replies; 5+ messages in thread
From: Liming Gao @ 2019-08-01 16:26 UTC (permalink / raw)
  To: devel@edk2.groups.io, Gao, Liming, Carsey, Jaben, Feng, Bob C

push@ 83d6207f99021ac9b2990fc9d66bab3cb3ae5f26

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Liming Gao
> Sent: Friday, August 2, 2019 12:13 AM
> To: Carsey, Jaben <jaben.carsey@intel.com>; devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
> Subject: Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> 
> Reviewed-by: Liming Gao <liming.gao@intel.com>
> 
> > -----Original Message-----
> > From: Carsey, Jaben
> > Sent: Thursday, August 1, 2019 10:45 PM
> > To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
> > Cc: Gao, Liming <liming.gao@intel.com>
> > Subject: RE: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> >
> > Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> >
> > Thanks
> > -Jaben
> >
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > > Bob Feng
> > > Sent: Thursday, August 01, 2019 6:24 AM
> > > To: devel@edk2.groups.io
> > > Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C
> > > <bob.c.feng@intel.com>
> > > Subject: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
> > >
> > > This is a regression issue introduced
> > > by commit 307e1650be267b67db7be1089e0979ace460d83
> > >
> > > This patch is to fix this issue.
> > >
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > > ---
> > >  BaseTools/Source/Python/Trim/Trim.py | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/BaseTools/Source/Python/Trim/Trim.py
> > > b/BaseTools/Source/Python/Trim/Trim.py
> > > index 8767b67f7e..24c3fafa76 100644
> > > --- a/BaseTools/Source/Python/Trim/Trim.py
> > > +++ b/BaseTools/Source/Python/Trim/Trim.py
> > > @@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target,
> > > ConvertHex, TrimLong):
> > >      try:
> > >          with open(Source, "r") as File:
> > >              Lines = File.readlines()
> > >      except IOError:
> > >          EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)
> > > -    expect:
> > > +    except:
> > >          EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error
> > > while processing file", File=Source)
> > >
> > >      PreprocessedFile = ""
> > >      InjectedFile = ""
> > >      LineIndexOfOriginalFile = None
> > > --
> > > 2.18.0.windows.1
> > >
> > >
> > >
> 
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
  2019-08-01 13:23 [Patch] BaseTools: Fixed a typo in Trim.py Bob Feng
  2019-08-01 14:44 ` [edk2-devel] " Carsey, Jaben
@ 2019-08-01 16:10 ` Philippe Mathieu-Daudé
  1 sibling, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-08-01 16:10 UTC (permalink / raw)
  To: devel, bob.c.feng; +Cc: Liming Gao

On 8/1/19 3:23 PM, Bob Feng wrote:
> This is a regression issue introduced
> by commit 307e1650be267b67db7be1089e0979ace460d83
> 
> This patch is to fix this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/Trim/Trim.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
> index 8767b67f7e..24c3fafa76 100644
> --- a/BaseTools/Source/Python/Trim/Trim.py
> +++ b/BaseTools/Source/Python/Trim/Trim.py
> @@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
>      try:
>          with open(Source, "r") as File:
>              Lines = File.readlines()
>      except IOError:
>          EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)
> -    expect:
> +    except:
>          EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error while processing file", File=Source)
>  
>      PreprocessedFile = ""
>      InjectedFile = ""
>      LineIndexOfOriginalFile = None
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-08-01 16:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-01 13:23 [Patch] BaseTools: Fixed a typo in Trim.py Bob Feng
2019-08-01 14:44 ` [edk2-devel] " Carsey, Jaben
2019-08-01 16:13   ` Liming Gao
     [not found]   ` <15B6D88ADF05C073.3315@groups.io>
2019-08-01 16:26     ` Liming Gao
2019-08-01 16:10 ` Philippe Mathieu-Daudé

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox