From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.221.46, mailfrom: philmd@redhat.com)
Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46])
 by groups.io with SMTP; Thu, 01 Aug 2019 09:10:48 -0700
Received: by mail-wr1-f46.google.com with SMTP id n9so49131053wrr.4
        for <devel@edk2.groups.io>; Thu, 01 Aug 2019 09:10:48 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id
         :date:user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=MNzmbG3Lb2HlR9yxy+vYmIQwxBzcA5HtN2Y6GuzEixE=;
        b=OptFQCD1SoQmwpFTJ6ZIcI1FWDO/sFpkaFT5C/gEwvy7AEfURKP0kiHR1Rq1U3DBRY
         uCXlzAz7G41X6iNF0uQrPFLBv45AuA7QlyhZ1n49YXc1RCVJJnnVCNJCz1G66c093X3o
         BmUYZClzqnfgDckCjhk3GhshBYilGATSDDws59vm+Pu+Hsp1CMGK9WZkoTeTyLZFFASm
         CC3SKORGD4i7qpvaefrh+9JoWRZoLT+rwlbrFCy3X3YrL9nN3aKU37yt7B5YAtO9btWc
         EBTziVyJyv3SqETyLObKzumswzpOvhTG59qnEdHLvAnjkQKIcxy4cfLDGLQbqm5+VT+G
         Yufg==
X-Gm-Message-State: APjAAAUeDCJSAo07Y/M+VTsa4WWPtee5UWSQIKxpgy02GcKIQWfUvggE
	m71NN+pOJGE8/71VQ3NYd17Eng==
X-Google-Smtp-Source: APXvYqy1Dd5Y/ns0mYxwK1SUonNT45BA21iRubKG5PKdyo/E98Sk3t2f5Vk0/2hCxRfs+sLWtlQEHQ==
X-Received: by 2002:adf:f544:: with SMTP id j4mr37004278wrp.150.1564675847043;
        Thu, 01 Aug 2019 09:10:47 -0700 (PDT)
Return-Path: <philmd@redhat.com>
Received: from [192.168.1.35] (46.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.46])
        by smtp.gmail.com with ESMTPSA id k124sm120394890wmk.47.2019.08.01.09.10.46
        (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128);
        Thu, 01 Aug 2019 09:10:46 -0700 (PDT)
Subject: Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py
To: devel@edk2.groups.io, bob.c.feng@intel.com
Cc: Liming Gao <liming.gao@intel.com>
References: <20190801132343.10628-1-bob.c.feng@intel.com>
From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= <philmd@redhat.com>
Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE;
 url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE
Message-ID: <a318ba96-87d6-c9d3-0fb4-7a46221a0856@redhat.com>
Date: Thu, 1 Aug 2019 18:10:45 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.7.0
MIME-Version: 1.0
In-Reply-To: <20190801132343.10628-1-bob.c.feng@intel.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

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>