BaseTools: Change source files to DOS format.

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

diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/UPT/UPT.py
index 23aff1c46dcdc7f697a0ea34aa90693ba0a8e430..59c4a88f8efea8141c03cad349f755e95624d415 100644 (file)
--- a/BaseTools/Source/Python/UPT/UPT.py
+++ b/BaseTools/Source/Python/UPT/UPT.py
@@ -2,7 +2,7 @@
 #\r
 # This file is the main entry for UPT \r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -39,6 +39,7 @@ from Logger.ToolError import FILE_TYPE_MISMATCH
 from Logger.ToolError import OPTION_CONFLICT\r
 from Logger.ToolError import FatalError\r
 from Logger.ToolError import UPT_ALREADY_INSTALLED_ERROR\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 import MkPkg\r
 import InstallPkg\r
@@ -50,13 +51,6 @@ from Library import GlobalData
 from Core.IpiDb import IpiDatabase\r
 from BuildVersion import gBUILD_VERSION\r
 \r
-##\r
-# Version and Copyright\r
-#\r
-#VersionNumber = "1.0"\r
-#__version__ = "Revision " + VersionNumber\r
-#__copyright__ = "Copyright (c) 2011 Intel Corporation All Rights Reserved."\r
-\r
 ## CheckConflictOption\r
 #\r
 # CheckConflictOption\r
@@ -105,7 +99,7 @@ def SetLogLevel(Opt):
 def Main():\r
     Logger.Initialize()\r
 \r
-    Parser = OptionParser(version=(MSG_VERSION + ' ' + gBUILD_VERSION), description=MSG_DESCRIPTION,\r
+    Parser = OptionParser(version=(MSG_VERSION + ' Build ' + gBUILD_VERSION), description=MSG_DESCRIPTION,\r
                           prog="UPT.exe", usage=MSG_USAGE)\r
 \r
     Parser.add_option("-d", "--debug", action="store", type="int", dest="debug_level", help=ST.HLP_PRINT_DEBUG_INFO)\r
@@ -171,7 +165,7 @@ def Main():
         setattr(Opt, Var[0], Var[1])\r
 \r
     try:\r
-        GlobalData.gWORKSPACE = GetWorkspace()\r
+        GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH = GetWorkspace()\r
     except FatalError, XExcept:\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r