diff options
author | Liming Gao <liming.gao@intel.com> | 2018-07-05 17:40:04 +0800 |
---|---|---|
committer | Liming Gao <liming.gao@intel.com> | 2018-07-09 10:25:47 +0800 |
commit | f7496d717357b9af78414d19679b073403812340 (patch) | |
tree | 67621e65fd181bdf8a12d12e7706579beaaed0fb /BaseTools/Source/Python/UPT/MkPkg.py | |
parent | 39456d00f36e04b7e7efb208f350f4e83b6c3531 (diff) | |
download | edk2-f7496d717357b9af78414d19679b073403812340.tar.gz edk2-f7496d717357b9af78414d19679b073403812340.tar.bz2 edk2-f7496d717357b9af78414d19679b073403812340.zip |
BaseTools: Clean up source files
1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/UPT/MkPkg.py')
-rw-r--r-- | BaseTools/Source/Python/UPT/MkPkg.py | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py index e7ec328a78..37942b8ed9 100644 --- a/BaseTools/Source/Python/UPT/MkPkg.py +++ b/BaseTools/Source/Python/UPT/MkPkg.py @@ -1,11 +1,11 @@ ## @file
# Install distribution package.
#
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -55,7 +55,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws ## CheckForExistingDp
#
# Check if there is a same name DP file existing
-# @param Path: The path to be checked
+# @param Path: The path to be checked
#
def CheckForExistingDp(Path):
if os.path.exists(Path):
@@ -76,7 +76,7 @@ def Main(Options = None): if Options is None:
Logger.Error("\nMkPkg", OPTION_UNKNOWN_ERROR, ST.ERR_OPTION_NOT_FOUND)
try:
- DataBase = GlobalData.gDB
+ DataBase = GlobalData.gDB
ContentFileClosed = True
WorkspaceDir = GlobalData.gWORKSPACE
@@ -85,7 +85,7 @@ def Main(Options = None): #
if not Options.PackFileToCreate:
Logger.Error("\nMkPkg", OPTION_UNKNOWN_ERROR, ST.ERR_OPTION_NOT_FOUND)
-
+
#
# Handle if the distribution package file already exists
#
@@ -95,7 +95,7 @@ def Main(Options = None): # Check package file existing and valid
#
CheckFileList('.DEC', Options.PackageFileList, ST.ERR_INVALID_PACKAGE_NAME, ST.ERR_INVALID_PACKAGE_PATH)
- #
+ #
# Check module file existing and valid
#
CheckFileList('.INF', Options.ModuleFileList, ST.ERR_INVALID_MODULE_NAME, ST.ERR_INVALID_MODULE_PATH)
@@ -104,10 +104,10 @@ def Main(Options = None): # Get list of files that installed with RePackage attribute available
#
RePkgDict = DataBase.GetRePkgDict()
-
- ContentFile = PackageFile(GlobalData.gCONTENT_FILE, "w")
+
+ ContentFile = PackageFile(GlobalData.gCONTENT_FILE, "w")
ContentFileClosed = False
-
+
#
# Add temp distribution header
#
@@ -118,7 +118,7 @@ def Main(Options = None): #
# add distribution level tool/misc files
- # before pack, current dir should be workspace dir, else the full
+ # before pack, current dir should be workspace dir, else the full
# path will be in the pack file
#
Cwd = getcwd()
@@ -132,8 +132,8 @@ def Main(Options = None): FileList += MiscObject.GetFileList()
for FileObject in FileList:
#
- # If you have unicode file names, please convert them to byte
- # strings in your desired encoding before passing them to
+ # If you have unicode file names, please convert them to byte
+ # strings in your desired encoding before passing them to
# write().
#
FromFile = os.path.normpath(FileObject.GetURI()).encode('utf_8')
@@ -151,8 +151,8 @@ def Main(Options = None): DistPkg.Header.RePackage = True
ContentFile.PackFile(FromFile)
chdir(Cwd)
-
- #
+
+ #
# Add init dp information
#
else:
@@ -160,14 +160,14 @@ def Main(Options = None): DistPkg.Header.Name = 'Distribution Package'
DistPkg.Header.Guid = str(uuid4())
DistPkg.Header.Version = '1.0'
-
+
DistPkg.GetDistributionPackage(WorkspaceDir, Options.PackageFileList, \
Options.ModuleFileList)
FileList, MetaDataFileList = DistPkg.GetDistributionFileList()
for File in FileList + MetaDataFileList:
FileFullPath = os.path.normpath(os.path.join(WorkspaceDir, File))
#
- # check whether file was included in a distribution that can not
+ # check whether file was included in a distribution that can not
# be repackaged
#
if FileFullPath in RePkgDict:
@@ -182,17 +182,17 @@ def Main(Options = None): )
else:
DistPkg.Header.RePackage = True
-
+
Cwd = getcwd()
chdir(WorkspaceDir)
ContentFile.PackFiles(FileList)
chdir(Cwd)
-
- Logger.Verbose(ST.MSG_COMPRESS_DISTRIBUTION_PKG)
-
+
+ Logger.Verbose(ST.MSG_COMPRESS_DISTRIBUTION_PKG)
+
ContentFile.Close()
ContentFileClosed = True
-
+
#
# Add Md5Sigature
#
@@ -201,7 +201,7 @@ def Main(Options = None): # Add current Date
#
DistPkg.Header.Date = str(strftime("%Y-%m-%dT%H:%M:%S", localtime()))
-
+
#
# Finish final dp file
#
@@ -214,7 +214,7 @@ def Main(Options = None): ReturnCode = 0
except FatalError as XExcept:
- ReturnCode = XExcept.args[0]
+ ReturnCode = XExcept.args[0]
if Logger.GetLevel() <= Logger.DEBUG_9:
Logger.Quiet(ST.MSG_PYTHON_ON % \
(python_version(), platform) + format_exc())
@@ -247,7 +247,7 @@ def Main(Options = None): ## CheckFileList
-#
+#
# @param QualifiedExt: QualifiedExt
# @param FileList: FileList
# @param ErrorStringExt: ErrorStringExt
@@ -263,7 +263,7 @@ def CheckFileList(QualifiedExt, FileList, ErrorStringExt, ErrorStringFullPath): if Ext.upper() != QualifiedExt.upper():
Logger.Error("\nMkPkg", OPTION_VALUE_INVALID, \
ErrorStringExt % Item)
-
+
Item = os.path.normpath(Item)
Path = mws.join(WorkspaceDir, Item)
if not os.path.exists(Path):
@@ -274,7 +274,7 @@ def CheckFileList(QualifiedExt, FileList, ErrorStringExt, ErrorStringFullPath): elif not IsValidPath(Item, WorkspaceDir):
Logger.Error("\nMkPkg", OPTION_VALUE_INVALID, \
ErrorStringExt % Item)
-
+
if not os.path.split(Item)[0]:
Logger.Error("\nMkPkg", OPTION_VALUE_INVALID, \
ST.ERR_INVALID_METAFILE_PATH % Item)
|