.pytools/Plugin/LicenseCheck: Use temp directory for git diff output

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>
Acked-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>

diff --git a/.pytool/Plugin/LicenseCheck/LicenseCheck.py b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
index 5733f7bf4ec03bf4fa83e7e61ddea3da3c15ac40..7b998daf6f6b428c109869914098c8f86ecff513 100644 (file)
--- a/.pytool/Plugin/LicenseCheck/LicenseCheck.py
+++ b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
@@ -5,6 +5,7 @@
 ##\r
 \r
 import os\r
+import shutil\r
 import logging\r
 import re\r
 from io import StringIO\r
@@ -61,12 +62,19 @@ class LicenseCheck(ICiBuildPlugin):
     #   - Junit Logger\r
     #   - output_stream the StringIO output stream from this plugin via logging\r
     def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):\r
-        return_buffer = StringIO()\r
-        params = "diff --unified=0 origin/master HEAD"\r
-        RunCmd("git", params, outstream=return_buffer)\r
-        p = return_buffer.getvalue().strip()\r
-        patch = p.split("\n")\r
-        return_buffer.close()\r
+        # Create temp directory\r
+        temp_path = os.path.join(Edk2pathObj.WorkspacePath, 'Build', '.pytool', 'Plugin', 'LicenseCheck')\r
+        if not os.path.exists(temp_path):\r
+            os.makedirs(temp_path)\r
+        # Output file to use for git diff operations\r
+        temp_diff_output = os.path.join (temp_path, 'diff.txt')\r
+        params = "diff --output={} --unified=0 origin/master HEAD".format(temp_diff_output)\r
+        RunCmd("git", params)\r
+        with open(temp_diff_output) as file:\r
+            patch = file.read().strip().split("\n")\r
+        # Delete temp directory\r
+        if os.path.exists(temp_path):\r
+            shutil.rmtree(temp_path)\r
 \r
         ignore_files = []\r
         if "IgnoreFiles" in pkgconfig:\r