ShellPkg: Fix the last command doesn't work in a script.

[mirror_edk2.git] / BaseTools / Source / Python / Trim / Trim.py

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 13485c72da51c22e6c12deb51777addcec2da3ae..8fefa1bcd9d273f03e8a0f431e3fdb092bf0dd0b 100644 (file)
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -177,13 +177,13 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
             EdkLogger.verbose("Found original file content starting from line %d"\r
                               % (LineIndexOfOriginalFile + 1))\r
 \r
+        if TrimLong:\r
+            Line = gLongNumberPattern.sub(r"\1", Line)\r
         # convert HEX number format if indicated\r
         if ConvertHex:\r
             Line = gHexNumberPattern.sub(r"0\2h", Line)\r
         else:\r
             Line = gHexNumberPattern.sub(r"\1\2", Line)\r
-        if TrimLong:\r
-            Line = gLongNumberPattern.sub(r"\1", Line)\r
 \r
         # convert Decimal number format\r
         Line = gDecNumberPattern.sub(r"\1", Line)\r
@@ -594,7 +594,7 @@ def Main():
                     "\nTrim",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when trimming [%s]" % InputFile,\r
-                    ExtraData="\n(Please send email to edk2-buildtools-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to edk2-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r