Reviewed-by: Yonghong Zhu <[email protected]> Best Regards, Zhu Yonghong
-----Original Message----- From: Gao, Liming Sent: Thursday, April 11, 2019 12:57 PM To: [email protected] Cc: Feng, YunhuaX <[email protected]>; Feng, Bob C <[email protected]>; Zhu, Yonghong <[email protected]> Subject: [Patch] BaseTools: Sometime write file not immediate to disk From: Yunhua Feng <[email protected]> BZ: https://bugzilla.tianocore.org/process_bug.cgi On Windows OS, sometime the generated file is not immediate saved to disk. When run nmake, prompt AutoGen.h not found, and stop build. Below blog shows Write-Replace to fix it. This patch uses this way to write temp file, then rename the temp file to the real file. https://blog.gocept.com/2013/07/15/reliable-file-updates-with-python/ Cc: Bob Feng <[email protected]> Cc: Liming Gao <[email protected]> Cc: Yonghong Zhu <[email protected]> Signed-off-by: Yunhua Feng <[email protected]> --- BaseTools/Source/Python/Common/Misc.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 5db9405ddc..3b3ab2d6df 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -22,6 +22,7 @@ from random import sample from struct import pack import uuid import subprocess +import tempfile from collections import OrderedDict import Common.LongFilePathOs as os @@ -476,15 +477,23 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True): if not os.access(DirName, os.W_OK): EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName) + OpenMode = "w" if IsBinaryFile: + OpenMode = "wb" + + if GlobalData.gIsWindows and not os.path.exists(File): + # write temp file, then rename the temp file to the real file + # to make sure the file be immediate saved to disk + with tempfile.NamedTemporaryFile(OpenMode, dir=os.path.dirname(File), delete=False) as tf: + tf.write(Content) + tempname = tf.name try: - with open(File, "wb") as Fd: - Fd.write(Content) - except IOError as X: + os.rename(tempname, File) + except: EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X) else: try: - with open(File, 'w') as Fd: + with open(File, OpenMode) as Fd: Fd.write(Content) except IOError as X: EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X) -- 2.13.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38850): https://edk2.groups.io/g/devel/message/38850 Mute This Topic: https://groups.io/mt/31027692/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
