[edk2-devel] [PATCH] BaseTools: Add more parameter checking for CopyFileOnChange()

Steven Shi posted 1 patch 4 years, 7 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
BaseTools/Source/Python/Common/Misc.py | 5 +++++
1 file changed, 5 insertions(+)
[edk2-devel] [PATCH] BaseTools: Add more parameter checking for CopyFileOnChange()
Posted by Steven Shi 4 years, 7 months ago
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2193

The current CopyFileOnChange() method in Misc.py does not
accept the input SrcFile parameter as a dir, but the method
does not check the SrcFile is dir or not. This patch is to
add more input parameter type checking and error message output
for method CopyFileOnChange.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Steven Shi <steven.shi@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 15ae6a9e40..7c93fc4dca 100755
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -541,6 +541,11 @@ def CopyFileOnChange(SrcFile, Dst, FileLock=None):
     Dst = LongFilePath(Dst)
 
     if not os.path.exists(SrcFile):
+        EdkLogger.error(None, FILE_COPY_FAILURE, ExtraData='CopyFileOnChange SrcFile does not exists: %s' % SrcFile)
+        return False
+
+    if os.path.isdir(SrcFile):
+        EdkLogger.error(None, FILE_COPY_FAILURE, ExtraData='CopyFileOnChange SrcFile is a dir, not a file: %s' % SrcFile)
         return False
 
     if os.path.isdir(Dst):
-- 
2.17.1.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47252): https://edk2.groups.io/g/devel/message/47252
Mute This Topic: https://groups.io/mt/34160448/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-