From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=woGBYRxj; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Fri, 02 Aug 2019 02:55:10 -0700 Received: by mail-wr1-f66.google.com with SMTP id r1so76491624wrl.7 for ; Fri, 02 Aug 2019 02:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=vlv51Xbdq/HHvfYDsdv87OVZ/qJNDWcBO1j0mP7k9YA=; b=woGBYRxjVV+oGEbApc8yZ0r317/+SNRWW4OJ9e5gH8HZHOqaQs5iQqrzWbn5itTo/Q 5W0s3JYG2j00sHiEJzFO17SJzAWQCnQjx3tUch/ule9Y76hPdPY56+l9F8uzsEvG6oxx pBw3CPzHpCLbQxZNhGoxYsJIBX5h4oxn7yKuM4XhnUK8W9EFJm6GWfQZPu3KpT4PcquU GLB0Z5hJnxIQQqdUfh8diCOmlnGnMTAPPR/a+G2qgs9dTx+s7byGCqNMNwXyI7dQxwVP mmzczApI+pQDBbecWsFylSYagFDF8Qy0yK8jxGzDFh12Q4+DOHYtrDoivKOqgScORwf+ EDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=vlv51Xbdq/HHvfYDsdv87OVZ/qJNDWcBO1j0mP7k9YA=; b=HHbGJ3qj04h2WgsHqabZzZkM06dW5+rDKlP+ZJqBqb7T40VGlb/YfbZUq2/PC3NLcH vNH59cZ+IiEjzn5ZxXb8V9OOzCN/gw6PVVLBBIAsuYBbX8DqfpGAIRlZqI8XRJQv5aZv ZIhQLoKcDuwc5Xz0Wt/IPMUBFBxDnY8Y3gWBbtjCii5IimU0Zv2PGFBwnuQ0Zj5oJme7 qIYmJwqLFZtNFdYKnNiEL/A5zU0Xkc5bGm/CfWjAkAypnrnYLqZhxfuIJVSMZk241byo E9s5MZ0N3JwwCxLrXyoZ+VuoRGETLfdf2cDt8tGzmvSFo+h6aNrwhujn7pViOhEy3GLa L8fQ== X-Gm-Message-State: APjAAAXRGZ10O2GW3hT0YCNMWnEW3fSPwAGy6Y8+SE5IxUMy+MOkeitP Zy3nrsHqJSMp9juVjxJbJ/EqOR2sslY= X-Google-Smtp-Source: APXvYqxfB6zYh5LK8UvblksiOhiKr4xKDHpVSkhmZAzMS6ve0MlGfVbqcLwjomBGqnHlpg8bCsrX5w== X-Received: by 2002:adf:90e7:: with SMTP id i94mr110642690wri.224.1564739708100; Fri, 02 Aug 2019 02:55:08 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id o20sm192328068wrh.8.2019.08.02.02.55.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 02:55:07 -0700 (PDT) Date: Fri, 2 Aug 2019 10:55:06 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io Cc: "Feng, Bob C" , "Fan, ZhijuX" , Max Knutsen , Philippe Mathieu-Daude , Andrew Fish , Laszlo Ersek , Michael D Kinney , Liming Gao Subject: Microsoft imports - was Re: [edk2-devel] [PATCH V2] BaseTools:Add extra debugging message Message-ID: <20190802095506.GS22656@bivouac.eciton.net> References: <20190725030217.16596-1-zhijux.fan@intel.com> <08650203BA1BD64D8AD9B6D5D74A85D160B513D3@SHSMSX105.ccr.corp.intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E4C776D@SHSMSX104.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4C776D@SHSMSX104.ccr.corp.intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline So, I'm not going to give any of the reviewers a hard time about this - the patch *looks* right and we've all occasionally given R-b on things we haven't actually tested because we don't always have the time. And by the time I hit it, it had already been fixed upstream. But what worries me is that not only was this an error that would have been caught by a simple build test - it was imported from an external project where the same would have applied. Chucking patched over the wall from another open source project is no improvement over chucking internal patches over the wall without proper (contributor) review or testing. Or was it modified on the way across? One change I would like to see enacted *immediately* is that *any* imports from other open source projects state the repository and the commit hash that it originated from. In the commit message - and where BZs are referenced in the message, also copied into the BZ. / Leif On Thu, Aug 01, 2019 at 12:57:36PM +0000, Liming Gao wrote: > Good catch. I have pushed this patch. Can you send one new patch to fix it? > > > -----Original Message----- > > From: Feng, Bob C > > Sent: Thursday, August 1, 2019 8:20 PM > > To: devel@edk2.groups.io; Fan, ZhijuX > > Cc: Max Knutsen ; Gao, Liming > > Subject: RE: [edk2-devel] [PATCH V2] BaseTools:Add extra debugging message > > > > Hi Zhiju, > > > > There is a typo in this patch. See it inline. > > > > Thanks, > > Bob > > > > -----Original Message----- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Fan, ZhijuX > > Sent: Thursday, July 25, 2019 11:02 AM > > To: devel@edk2.groups.io > > Cc: Max Knutsen ; Feng, Bob C ; Gao, Liming ; Fan, ZhijuX > > > > Subject: [edk2-devel] [PATCH V2] BaseTools:Add extra debugging message > > > > From: Max Knutsen > > > > BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2014 > > > > Add extra debugging to improve error identification. > > Error while processing file if the file is read incorrectly > > > > This patch is going to fix that issue. > > > > Cc: Bob Feng > > Cc: Liming Gao > > Signed-off-by: Zhiju.Fan > > --- > > BaseTools/Source/Python/AutoGen/StrGather.py | 16 ++++++++++------ > > BaseTools/Source/Python/Trim/Trim.py | 4 +++- > > 2 files changed, 13 insertions(+), 7 deletions(-) > > > > diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py > > index 2e4671a433..eed30388be 100644 > > --- a/BaseTools/Source/Python/AutoGen/StrGather.py > > +++ b/BaseTools/Source/Python/AutoGen/StrGather.py > > @@ -526,12 +526,16 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode): > > return UniObjectClass > > > > for File in FileList: > > - if os.path.isfile(File): > > - Lines = open(File, 'r') > > - for Line in Lines: > > - for StrName in STRING_TOKEN.findall(Line): > > - EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName) > > - UniObjectClass.SetStringReferenced(StrName) > > + try: > > + if os.path.isfile(File): > > + Lines = open(File, 'r') > > + for Line in Lines: > > + for StrName in STRING_TOKEN.findall(Line): > > + EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName) > > + UniObjectClass.SetStringReferenced(StrName) > > + except: > > + EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "SearchString: Error while processing file", File=File, > > RaiseError=False) > > + raise > > > > UniObjectClass.ReToken() > > > > diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py > > index 43119bd7ff..8767b67f7e 100644 > > --- a/BaseTools/Source/Python/Trim/Trim.py > > +++ b/BaseTools/Source/Python/Trim/Trim.py > > @@ -73,8 +73,10 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong): > > try: > > with open(Source, "r") as File: > > Lines = File.readlines() > > - except: > > + except IOError: > > EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source) > > + expect: > > > > Typo here. expect should except > > > > + EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error while processing file", File=Source) > > > > PreprocessedFile = "" > > InjectedFile = "" > > -- > > 2.14.1.windows.1 > > > > > > > > > >