public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael Kubacki" <mikuback@linux.microsoft.com>
To: devel@edk2.groups.io, michael.d.kinney@intel.com
Cc: Sean Brogan <sean.brogan@microsoft.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Liming Gao <gaoliming@byosoft.com.cn>,
	Michael Kubacki <michael.kubacki@microsoft.com>
Subject: Re: [edk2-devel] [Patch V2 1/1] .pytools/Plugin/LicenseCheck: Use temp directory for git diff output
Date: Tue, 23 Nov 2021 18:25:52 -0500	[thread overview]
Message-ID: <8c0245e6-8f0f-6832-673e-978410b4ca19@linux.microsoft.com> (raw)
In-Reply-To: <20211123173131.1245-1-michael.d.kinney@intel.com>

Acked-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 11/23/2021 12:31 PM, Michael D Kinney wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3746
> 
> Use --output option in git diff command to remove code diffs
> from build log on stdout when LicenseCheck plugin is run.
> Instead, create a temp directory for the diff output file and
> remove the temp directory after the diff output is processed.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael Kubacki <michael.kubacki@microsoft.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   .pytool/Plugin/LicenseCheck/LicenseCheck.py | 20 ++++++++++++++------
>   1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/.pytool/Plugin/LicenseCheck/LicenseCheck.py b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> index 5733f7bf4ec0..7b998daf6f6b 100644
> --- a/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> +++ b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> @@ -5,6 +5,7 @@
>   ##
>   
>   import os
> +import shutil
>   import logging
>   import re
>   from io import StringIO
> @@ -61,12 +62,19 @@ class LicenseCheck(ICiBuildPlugin):
>       #   - Junit Logger
>       #   - output_stream the StringIO output stream from this plugin via logging
>       def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):
> -        return_buffer = StringIO()
> -        params = "diff --unified=0 origin/master HEAD"
> -        RunCmd("git", params, outstream=return_buffer)
> -        p = return_buffer.getvalue().strip()
> -        patch = p.split("\n")
> -        return_buffer.close()
> +        # Create temp directory
> +        temp_path = os.path.join(Edk2pathObj.WorkspacePath, 'Build', '.pytool', 'Plugin', 'LicenseCheck')
> +        if not os.path.exists(temp_path):
> +            os.makedirs(temp_path)
> +        # Output file to use for git diff operations
> +        temp_diff_output = os.path.join (temp_path, 'diff.txt')
> +        params = "diff --output={} --unified=0 origin/master HEAD".format(temp_diff_output)
> +        RunCmd("git", params)
> +        with open(temp_diff_output) as file:
> +            patch = file.read().strip().split("\n")
> +        # Delete temp directory
> +        if os.path.exists(temp_path):
> +            shutil.rmtree(temp_path)
>   
>           ignore_files = []
>           if "IgnoreFiles" in pkgconfig:
> 

  reply	other threads:[~2021-11-23 23:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-23 17:31 [Patch V2 1/1] .pytools/Plugin/LicenseCheck: Use temp directory for git diff output Michael D Kinney
2021-11-23 23:25 ` Michael Kubacki [this message]
2021-11-24  6:23 ` 回复: " gaoliming
2021-11-26 15:52 ` [edk2-devel] " Sean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8c0245e6-8f0f-6832-673e-978410b4ca19@linux.microsoft.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox